Improved CSS and SASS.
h3rald h3rald@h3rald.com
Sun, 06 Sep 2009 00:35:01 +0200
8 files changed,
102 insertions(+),
141 deletions(-)
M
Rules
→
Rules
@@ -15,8 +15,12 @@ compile /(rss|atom)/ do
rep.filter :erb end -compile 'css/*' do - rep.filter :sass if item[:filter] == 'sass' +compile '/css/*' do + filter :sass, { + :load_paths => [Dir.pwd+"/content/css"], + :full_exception => true, + :line_numbers => true + } end compile '*' do
A
content/css/_text.sass
@@ -0,0 +1,85 @@
+----- +----- +=title_font + font-family: "Palatino Linotype", "Palatino", "Book Antiqua", "Serif" +=body_font + font-family: "Georgia", "Serif" + +=title + +title_font + font-variant: small-caps + margin: 1em 0 0 0 + +/* TEXT */ + +body + color: #000 + +body_font + font-size: 0.9em + +h2 + font-size: 2.3em + +title + margin: 0 + +h3 + font-size: 1.7em + +title + +h4 + font-size: 1.3em + +title + +.dropcap + font-family: !title_font + float: left + font-size: 4.2em + line-height: 0.75em + margin-top: 0.15em + padding-right: 0.25em + text-transform: uppercase + +p.first-p:first-line + font-variant: small-caps + +#services h3 + text-align: center + +em + font-style: italic + +#footer, #border-bottom + color: #BDB7BA + +/**** Article Lists ****/ + +.article-list h3, .left-column h3, .right-column h3 + text-align: center + +.article-item h4 + margin: 0 + padding: 0 + +.article-tags + font-size: 90% + padding-left: 1em + +.article-summary + padding-top: 0.5em + padding-left: 1em + font-style: italic + +/******* LINKS *******/ + +a, a.gs-title + text-decoration: underline + outline: none + +h4 a + text-decoration: none + +a, a.gs-title, .gsc-cursor-page + color: #A4282D + +a:hover, a.gs-title:hover, .gsc-cursor-page:hover + color: #CF282D
M
content/css/code.sass
→
content/css/_code.sass
@@ -1,9 +1,10 @@
----- -filter: sass ----- -!code_font = "Consolas", "Monaco", Monospace +=code_font + font-family: "Consolas", "Monaco", "Monospace" + .highlight - font-family: !code_font + +code_font border: 1px solid #A4282D padding: 5px margin: 5px 0@@ -11,7 +12,7 @@ overflow: auto
code - font-family: !code_font + +code_font .highlight
M
content/css/elements.sass
→
content/css/_elements.sass
@@ -1,5 +1,4 @@
----- -filter: sass ----- #content img margin: 0 5px@@ -20,7 +19,7 @@ font-style: italic
p line-height: 1.5em - margin: 1.7em 0 + margin: 1em 0 blockquote, .note
M
content/css/layout.sass
→
content/css/_layout.sass
@@ -1,5 +1,4 @@
----- -filter: sass ----- * font-family: inherit@@ -9,58 +8,44 @@ border: none
padding: 0 margin: 0 - html, body height: 100% line-height: 1.2 - p, ol, ul margin: 0.5em 0 - table border-collapse: collapse border-spacing: 0 - body margin: 0 padding: 0 - #header width: 100% background-color: #000 padding: 5px 0 height: 70px - #header-container, #footer-container margin: auto width: 900px - #header-left float: left width: 300px - #header-right float: right text-align: right width: 600px - -ul#navigation - display: block - - #navigation li float: left list-style-type: none padding-left: 10px - #ie-warning border-bottom: 1px solid #F5B800@@ -69,8 +54,6 @@ padding: 1em
margin-top: -5px margin-bottom: 5px font-weight: bold - font-family: Georgia, Serif - #container padding: 15px@@ -78,78 +61,64 @@ margin: auto
width: 900px height: 100% - #main background: #fff - #content text-align: justify padding: 0 10px - #wrapper min-height: 100% margin-bottom: -40px background: #000 - #border-bottom background: #000 height: auto padding: 0 - padding-top: 40px width: 100% - #services margin: auto width: 1000px - #footer position: relative height: 40px - font-family: Georgia, Serif width: 100% - font-size: 95% + font-size: 80% text-align: center + padding-top: 1em background-color: #000 - .clearfooter height: 40px clear: both background: #000 - .footer-left, .footer-right, .footer-center float: left text-align: left font-size: 90% display: block - height: 550px - + height: 600px .footer-left, .footer-right width: 30% - .footer-center width: 40% - .footer-div clear: both font-size: 95% color: #CACACA - #share margin: auto padding: 5px text-align: center - #comments width: 900px
M
content/css/main.sass
→
content/css/main.sass
@@ -1,7 +1,6 @@
----- -filter: sass ----- -@import layout.sass +@import _layout.sass @import elements.sass @import text.sass @import code.sass
D
content/css/text.sass
@@ -1,93 +0,0 @@
------ -filter: sass ------ -/* Variables */ - -!title_font = "Palatino Linotype", Palatino, 'Book Antiqua', Serif -!body_font = Georgia, Serif -/* TEXT */ - -body - color: #000 - font: 0.9em !body_font - -h1 - height: 60px - -h2, h3, h4, h5 - margin: 0 - font-family: !title_font - font-variant: small-caps - -h2 - font-size: 2.3em - - -h3 - font-size: 1.7em - -h4 - font-size: 1.3em - -.dropcap - font-family: !titlw_font - float: left - font-size: 4.2em - line-height: 0.75em - margin-top: 0.15em - padding-right: 0.25em - text-transform: uppercase - - - -p.first-p:first-line - font-variant:small-caps - -#services h3 - padding-top: 10px - text-align: center - -#navigation a - font-size: 2em - -em - font-style: italic - - -#footer, #border-bottom - color: #BDB7BA - -/**** Article Lists ****/ - -.article-list h3, .left-column h3, .right-column h3 - margin-bottom: 1.5em - text-align: center - -.article-item h4 - margin: 0 - padding: 0 - -.article-tags - padding-top: -0.1em - font-size: 90% - padding-left: 1em - - -.article-summary - padding-top: 0.5em - padding-left: 1em - font-style: italic - -/******* LINKS *******/ - -a, a.gs-title - text-decoration:none - outline:none - - -a, a.gs-title, .gsc-cursor-page - color: #A4282D - - -a:hover, a.gs-title:hover, .gsc-cursor-page:hover - color: #CF282D
M
layouts/default.erb
→
layouts/default.erb
@@ -23,10 +23,7 @@ <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta content="44.388041;9.073248" name="ICBM" /> - <link href="/css/layout.css" media="all" rel="stylesheet" type="text/css" /> - <link href="/css/text.css" media="all" rel="stylesheet" type="text/css" /> - <link href="/css/elements.css" media="all" rel="stylesheet" type="text/css" /> - <link href="/css/code.css" media="all" rel="stylesheet" type="text/css" /> + <link href="/css/main.css" media="all" rel="stylesheet" type="text/css" /> </head> <body> <a href="http://github.com/h3rald/h3rald"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>