ocracy.org
changeset 160:c11c0f803587
Allow for custom CSS when setting a specific style
| author | Emanuele Aina <em@nerd.ocracy.org> |
|---|---|
| date | Sun Jan 17 14:02:22 2010 +0100 (6 months ago) |
| parents | f770c6fb043c |
| children | bede583b4a5f |
| files | generate.py nerd.ocracy.org/index.html planet-config/index.html.tmpl styles/adjustements-easter.css styles/adjustements-halloween.css styles/adjustements-xmas.css styles/adjustements.css styles/main.css |
line diff
1.1 --- a/generate.py Fri Jan 15 11:29:48 2010 +0100 1.2 +++ b/generate.py Sun Jan 17 14:02:22 2010 +0100 1.3 @@ -22,6 +22,11 @@ 1.4 return 'heads-' + sys.argv[1] 1.5 return 'heads' 1.6 1.7 +def adjustements_source(): 1.8 + if len(sys.argv) > 1: 1.9 + return 'adjustements-' + sys.argv[1] + '.css' 1.10 + return 'adjustements.css' 1.11 + 1.12 def read_map(map): 1.13 m = {} 1.14 fin = open(map) 1.15 @@ -237,6 +242,7 @@ 1.16 1.17 1.18 parse_css('styles/main.css', 'styles/main.map') 1.19 +parse_css('styles/' + adjustements_source(), 'styles/main.map', 'adjustements.css') 1.20 parse_css('styles/colors.css', 'styles/nerd.map', 'nerd.css') 1.21 parse_css('styles/colors.css', 'styles/planet.map', 'planet.css') 1.22
2.1 --- a/nerd.ocracy.org/index.html Fri Jan 15 11:29:48 2010 +0100 2.2 +++ b/nerd.ocracy.org/index.html Sun Jan 17 14:02:22 2010 +0100 2.3 @@ -6,6 +6,7 @@ 2.4 <title>NerdOCRACY</title> 2.5 <style type="text/css" media="screen, projection"> 2.6 @import "styles/main.css"; 2.7 + @import "styles/adjustements.css"; 2.8 @import "styles/nerd.css"; 2.9 </style> 2.10 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
3.1 --- a/planet-config/index.html.tmpl Fri Jan 15 11:29:48 2010 +0100 3.2 +++ b/planet-config/index.html.tmpl Sun Jan 17 14:02:22 2010 +0100 3.3 @@ -6,6 +6,7 @@ 3.4 <title><TMPL_VAR name></title> 3.5 <style type="text/css" media="screen, projection"> 3.6 @import "styles/main.css"; 3.7 + @import "styles/adjustements.css"; 3.8 @import "styles/planet.css"; 3.9 </style> 3.10 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/styles/adjustements-xmas.css Sun Jan 17 14:02:22 2010 +0100 4.3 @@ -0,0 +1,12 @@ 4.4 +h2 { 4.5 + margin-top: 1.5em; /*IES:18px/24px/39px*/ 4.6 +} 4.7 + 4.8 +h2:first-child { 4.9 + margin-top: 1em; 4.10 +} 4.11 + 4.12 +.content img.blog-head { 4.13 + margin: -60px -45px 0 0; 4.14 +} 4.15 +
5.1 --- a/styles/main.css Fri Jan 15 11:29:48 2010 +0100 5.2 +++ b/styles/main.css Sun Jan 17 14:02:22 2010 +0100 5.3 @@ -102,15 +102,10 @@ 5.4 letter-spacing: 0.25em; 5.5 font-size: 1em; /*IES:12px/16px/26px*/ 5.6 margin: 0; 5.7 - margin-top: 1.5em; /*IES:18px/24px/39px*/ 5.8 padding: 0 0.5em; /*IES:0 6px/0 8px/0 13px*/ 5.9 } 5.10 5.11 -h2:first-child { 5.12 - margin-top: 1em; 5.13 -} 5.14 - 5.15 -.blog-full-name { 5.16 +blog-full-name { 5.17 letter-spacing: normal; 5.18 font-style: italic; /*IE:normal*/ 5.19 } 5.20 @@ -192,7 +187,7 @@ 5.21 5.22 .content img.blog-head { 5.23 float: right; 5.24 - margin: -60px -45px 0 0; 5.25 + margin: -40px -20px 0 0; 5.26 } 5.27 5.28 .content .info-table td {
