diff --git a/_layouts/default.html b/_layouts/default.html index 3f384d1..330b4fa 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -21,24 +21,25 @@ -
-

{{ site.title }}

-

{{ site.slogan }}

-
- -
- {{ content }} -
- +
+
+

{{ site.title }}

+
+ +
+ {{ content }} +
+ +
{% include google_analytics.html %} diff --git a/_sass/_base.scss b/_sass/_base.scss new file mode 100644 index 0000000..0511cbd --- /dev/null +++ b/_sass/_base.scss @@ -0,0 +1,38 @@ +@import "susy"; + +@font-face { + font-family: Typewriter; + src: url(Typewriter.otf) format("opentype"); +} + +$serif: 'PT Serif', 'Georgia', serif; +$typewriter: Typewriter,"Georgia","Times",serif; + +$total-columns : 6; +$column-width : 3em; +$gutter-width : 1em; +$grid-padding : $gutter-width; + +$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; +} + + diff --git a/_sass/_footer.scss b/_sass/_footer.scss new file mode 100644 index 0000000..43c268c --- /dev/null +++ b/_sass/_footer.scss @@ -0,0 +1 @@ +// Footer \ No newline at end of file diff --git a/_sass/_header.scss b/_sass/_header.scss new file mode 100644 index 0000000..8d7d9c7 --- /dev/null +++ b/_sass/_header.scss @@ -0,0 +1,35 @@ +// 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 new file mode 100644 index 0000000..5d6d0de --- /dev/null +++ b/_sass/_main.scss @@ -0,0 +1,23 @@ +// 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 new file mode 100644 index 0000000..dcf88b6 --- /dev/null +++ b/_sass/screen.scss @@ -0,0 +1,5 @@ +@import "base"; +@import "header"; +@import "main"; +@import "footer"; + diff --git a/stylesheets/screen.css b/stylesheets/screen.css index dea1319..a1d27f9 100644 --- a/stylesheets/screen.css +++ b/stylesheets/screen.css @@ -1,229 +1 @@ -@font-face { - font-family: Typewriter; - src: url(Typewriter.otf) format("opentype"); -} - -/* Resets - ------ */ - -html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, -p, blockquote, pre, a, abbr, address, cite, code, del, dfn, em, -img, ins, kbd, q, samp, small, strong, sub, sup, var, b, i, hr, -dl, dt, dd, ol, ul, li, fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, figure, figcaption, hgroup, -menu, footer, header, nav, section, summary, time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; -} - -article, aside, canvas, figure, figure img, figcaption, hgroup, -footer, header, nav, section, audio, video { - display: block; -} - -a { - text-decoration: none; -} - -body { - color: #343434; - margin: 0 auto; - background: #ffffff; - font-family: PT Serif, Georgia, serif; - font-size: 18px; - width: 712px; - padding: 48px 48px 84px; - margin: 0 auto; -} - -h1 { - font-size: 48px; - line-height: 58px; -} - -h2 { - font-size: 32px; - line-height: 36px; -} - -h3 { - font-size: 24px; - line-height: 32px; - font-weight: normal; - margin: 0.5em 0; -} - -img.left { - float: left; - margin: 0 1em 1em 0; -} - -img.right { - float: right; - margin: 0 0 1em 1em; -} - -header h1, header h2 { - display: inline; - font-family: Typewriter,"Georgia","Times",serif; - font-weight: normal; - padding-right: 10px; -} - -header h1 a { - color: #343434; -} - -header h2 { - color: #676767; -} - -nav { - margin: 1em 0; - padding: 0 0 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 header h1 { - display: block; - font-size: 32px; - line-height: 36px; - margin-bottom: 1em; - text-transform: lowercase; -} - -#main p { - text-align: justify; - margin: 0.5em 0 1em 0; -} - -#main ul, #main ol { - margin-left: 2em; -} - -/** Article styles **/ -article.hentry { - border-bottom: 1px #dedede solid; -} - -article pre { - background: #000; - color: #fff; - padding: 10px; - overflow: auto; -} - -article .gist-file pre { - color: #000; -} - -article footer time { - display: block; - text-align: right; -} - -article.list { - clear: both; -} - -article.list time { - font-size: 16px; - width: 120px; - color: #696969; - float: left; -} - -blockquote { - margin-left: 2em; - color: #565656; - font-style: italic; -} - -footer { - margin: 1em 0; - font-size: 16px; -} - -body>footer { - border-top: 1px #dedede solid; - padding: 1em 0; -} - -#main .vcard { - padding: 10px 0; - margin: 1em 0 0 0; - clear: both; -} - -#main .vcard p { - font-size: 16px; - margin: 0 0 0.5em 0; -} - -#main .vcard img { - float: left; - margin: 0 0.5em 0 0; - border: 1px #dedede solid; - padding: 3px; -} - -@media only screen and (min-width: 768px) and (max-width: 991px) { - - body { - width: 712px; - padding: 48px 28px 60px; - } - - #main { - 528px; - } -} - -@media only screen and (max-width: 767px) { - - body { - width: 252px; - padding: 48px 34px 60px; - } - - body>header h2 { - display: none; - } - - #main { - width: 252px; - } -} - -@media only screen and (min-width: 480px) and (max-width: 767px) { - - body { - width: 436px; - padding: 36px 22px 48px; - } - - #main { - width: 436px; - } - -} - +@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}