conversion in progress

This commit is contained in:
James Walker 2013-11-08 12:47:13 -05:00
parent 60f88d79ab
commit d29be16edc
7 changed files with 122 additions and 247 deletions

View File

@ -21,9 +21,9 @@
<meta http-equiv="X-XRDS-Location" content="http://www.myopenid.com/xrds?username=walkah.myopenid.com" />
</head>
<body>
<div class="container">
<header>
<h1><a href="/">{{ site.title }}</a></h1>
<h2>{{ site.slogan }}</h2>
<h1 id="title"><a href="/">{{ site.title }}</a></h1>
</header>
<nav role="navigation">
<ul class="navigation">
@ -39,6 +39,7 @@
<footer>
&copy; 2002-{{ site.time | date:"%Y" }} {{ site.author }}
</footer>
</div>
{% include google_analytics.html %}
</body>
</html>

38
_sass/_base.scss Normal file
View File

@ -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;
}

1
_sass/_footer.scss Normal file
View File

@ -0,0 +1 @@
// Footer

35
_sass/_header.scss Normal file
View File

@ -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;
}
}
}
}

23
_sass/_main.scss Normal file
View File

@ -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;
}
}
}

5
_sass/screen.scss Normal file
View File

@ -0,0 +1,5 @@
@import "base";
@import "header";
@import "main";
@import "footer";

View File

@ -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}