From a866b05a03339c8f3202880f39b13222ccf7edfc Mon Sep 17 00:00:00 2001 From: James Walker Date: Sun, 10 Nov 2013 12:47:03 -0500 Subject: [PATCH] style cleanup and workingness --- _layouts/default.html | 23 +++---- _sass/_base.scss | 24 +------- _sass/_footer.scss | 1 - _sass/_header.scss | 35 ----------- _sass/_main.scss | 23 ------- _sass/screen.scss | 137 ++++++++++++++++++++++++++++++++++++++++- stylesheets/screen.css | 2 +- 7 files changed, 150 insertions(+), 95 deletions(-) delete mode 100644 _sass/_footer.scss delete mode 100644 _sass/_header.scss delete mode 100644 _sass/_main.scss diff --git a/_layouts/default.html b/_layouts/default.html index 330b4fa..5af73bc 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -22,17 +22,18 @@
-
-

{{ site.title }}

-
- +
{{ content }}
diff --git a/_sass/_base.scss b/_sass/_base.scss index 0511cbd..6a0e937 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -8,8 +8,8 @@ $serif: 'PT Serif', 'Georgia', serif; $typewriter: Typewriter,"Georgia","Times",serif; -$total-columns : 6; -$column-width : 3em; +$total-columns : 4; +$column-width : 4em; $gutter-width : 1em; $grid-padding : $gutter-width; @@ -17,22 +17,4 @@ $container-style: magic; $show-grid-backgrounds : true; -$break: 12; - -.container { - @include container($total-columns, $break); -} - -body { - color: #343434; - background: #ffffff; - font-family: $serif; - font-size: 16px; - padding-top: 3em; -} - -a { - text-decoration: none; -} - - +$break: 8; \ No newline at end of file diff --git a/_sass/_footer.scss b/_sass/_footer.scss deleted file mode 100644 index 43c268c..0000000 --- a/_sass/_footer.scss +++ /dev/null @@ -1 +0,0 @@ -// Footer \ No newline at end of file diff --git a/_sass/_header.scss b/_sass/_header.scss deleted file mode 100644 index 8d7d9c7..0000000 --- a/_sass/_header.scss +++ /dev/null @@ -1,35 +0,0 @@ -// Header - -header { - #title { - display: inline; - font-family: $typewriter; - font-weight: normal; - font-size: 3em; - a { - color: #343434; - } - } -} - -nav { - margin: 1em 0; - text-transform: uppercase; - border-bottom: 1px solid #dedede; - - ul.navigation { - border-left: 4px solid #dedede; - padding-left: 0.5em; - - li { - display: inline; - list-style-type: none; - padding: 0 1em 0 0; - font-size: 16px; - - a { - color: #303030; - } - } - } -} \ No newline at end of file diff --git a/_sass/_main.scss b/_sass/_main.scss deleted file mode 100644 index 5d6d0de..0000000 --- a/_sass/_main.scss +++ /dev/null @@ -1,23 +0,0 @@ -// Main - - -#main { - img.left { - float: left; - margin: 0 1em 1em 0; - } - - img.right { - float: right; - margin: 0 0 1em 1em; - } - - .vcard { - img { - float: left; - margin: 0 0.5em 0 0; - border: 1px #dedede solid; - padding: 3px; - } - } -} \ No newline at end of file diff --git a/_sass/screen.scss b/_sass/screen.scss index dcf88b6..b2eaf8c 100644 --- a/_sass/screen.scss +++ b/_sass/screen.scss @@ -1,5 +1,136 @@ @import "base"; -@import "header"; -@import "main"; -@import "footer"; +body { + color: #343434; + background: #ffffff; + font-family: $serif; + + a { text-decoration: none; } + + .container { + @include container($total-columns, $break); + //@include susy-grid-background; + + #header { + header { + h1 { + font-family: $typewriter; + + a { + color: #343434; + } + } + } + + nav { + text-transform: uppercase; + + ul.navigation { + border-left: 4px solid #dedede; + padding-left: 0.5em; + + li { + display: inline; + list-style-type: none; + padding: 0 1em 0 0; + + a { + color: #303030; + } + } + } + } + } + + #main { + clear: both; + padding: 1em 0; + border-top: 1px solid #dedede; + + article.hentry { + border-bottom: 1px #dedede solid; + } + + article { + pre { + background: #000; + color: #fff; + padding: 0.5em; + overflow: auto; + } + + .gist-file pre { + color: #000; + } + + footer time { + display: block; + text-align: right; + } + + } + + article.list { + clear: both; + border-bottom: 1px solid #dedede; + line-height: 2; + + time { + display: none; + } + } + + .vcard { + padding: 10px 0; + margin: 1em 0 0 0; + clear: both; + + p { + font-size: 16px; + margin: 0 0 0.5em 0; + } + + img { + float: left; + margin: 0 0.5em 0 0; + border: 1px #dedede solid; + padding: 3px; + } + } + } + } +} + + +@include at-breakpoint($break) { + body .container { + //@include susy-grid-background; + #header { + clear: both; + header { + @include span-columns(2); + } + + nav { + line-height: 3em; + @include span-columns(6 omega); + + ul.navigation { + border-left: 1px solid #dedede; + padding-left: 1em; + } + } + } + + #main { + article.list { + time { + display: block; + float: left; + width: 8em; + color: #696969; + } + } + } + } +} diff --git a/stylesheets/screen.css b/stylesheets/screen.css index a1d27f9..27bd141 100644 --- a/stylesheets/screen.css +++ b/stylesheets/screen.css @@ -1 +1 @@ -@font-face{font-family:Typewriter;src:url(Typewriter.otf) format("opentype")}.container{*zoom:1;max-width:23em;_width:23em;padding-left:1em;padding-right:1em;margin-left:auto;margin-right:auto}.container:after{content:"";display:table;clear:both}@media (min-width: 47em){.container{max-width:47em}}body{color:#343434;background:#ffffff;font-family:"PT Serif","Georgia",serif;font-size:16px;padding-top:3em}a{text-decoration:none}header #title{display:inline;font-family:Typewriter,"Georgia","Times",serif;font-weight:normal;font-size:3em}header #title a{color:#343434}nav{margin:1em 0;text-transform:uppercase;border-bottom:1px solid #dedede}nav ul.navigation{border-left:4px solid #dedede;padding-left:0.5em}nav ul.navigation li{display:inline;list-style-type:none;padding:0 1em 0 0;font-size:16px}nav ul.navigation li a{color:#303030}#main img.left{float:left;margin:0 1em 1em 0}#main img.right{float:right;margin:0 0 1em 1em}#main .vcard img{float:left;margin:0 0.5em 0 0;border:1px #dedede solid;padding:3px} +@font-face{font-family:Typewriter;src:url(Typewriter.otf) format("opentype")}body{color:#343434;background:#ffffff;font-family:"PT Serif","Georgia",serif}body a{text-decoration:none}body .container{*zoom:1;max-width:19em;_width:19em;padding-left:1em;padding-right:1em;margin-left:auto;margin-right:auto}body .container:after{content:"";display:table;clear:both}@media (min-width: 39em){body .container{max-width:39em}}body .container #header header h1{font-family:Typewriter,"Georgia","Times",serif}body .container #header header h1 a{color:#343434}body .container #header nav{text-transform:uppercase}body .container #header nav ul.navigation{border-left:4px solid #dedede;padding-left:0.5em}body .container #header nav ul.navigation li{display:inline;list-style-type:none;padding:0 1em 0 0}body .container #header nav ul.navigation li a{color:#303030}body .container #main{clear:both;padding:1em 0;border-top:1px solid #dedede}body .container #main article.hentry{border-bottom:1px #dedede solid}body .container #main article pre{background:#000;color:#fff;padding:0.5em;overflow:auto}body .container #main article .gist-file pre{color:#000}body .container #main article footer time{display:block;text-align:right}body .container #main article.list{clear:both;border-bottom:1px solid #dedede;line-height:2}body .container #main article.list time{display:none}body .container #main .vcard{padding:10px 0;margin:1em 0 0 0;clear:both}body .container #main .vcard p{font-size:16px;margin:0 0 0.5em 0}body .container #main .vcard img{float:left;margin:0 0.5em 0 0;border:1px #dedede solid;padding:3px}@media (min-width: 39em){body .container #header{clear:both}body .container #header header{width:23.07692%;float:left;margin-right:2.5641%}body .container #header nav{line-height:3em;width:74.35897%;float:right;margin-right:0}body .container #header nav ul.navigation{border-left:1px solid #dedede;padding-left:1em}body .container #main article.list time{display:block;float:left;width:8em;color:#696969}}