walkah/net
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

style cleanup and workingness

Browse Source
This commit is contained in:
James Walker 2013-11-10 12:47:03 -05:00
parent d29be16edc
commit a866b05a03
7 changed files with 150 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
_layouts/default.html
View File

@ -22,17 +22,18 @@
</head>
<body>
<div class="container">
<header>
<h1 id="title"><a href="/">{{ site.title }}</a></h1>
</header>
<nav role="navigation">
<ul class="navigation">
<li><a href="/">Home</a></li>
<li><a href="/about.html">About</a></li>
<li><a href="/blog/">Blog</a></li>
<li><a href="/contact.html">Contact</a></li>
</ul>
</nav>
<div id="header">
<header>
<h1 id="title"><a href="/">{{ site.title }}</a></h1>
</header>
<nav role="navigation">
<ul class="navigation">
<li><a href="/about.html">About</a></li>
<li><a href="/blog/">Blog</a></li>
<li><a href="/contact.html">Contact</a></li>
</ul>
</nav>
</div>
<section id="main">
{{ content }}
</section>

24
_sass/_base.scss
View File

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

1
_sass/_footer.scss
View File

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

35
_sass/_header.scss
View File

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

23
_sass/_main.scss
View File

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

137
_sass/screen.scss
View File

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

2
stylesheets/screen.css
View File

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