from susy to bourbon/neat
This commit is contained in:
parent
c28cc89649
commit
ff419b8276
3
Gemfile
3
Gemfile
@ -5,3 +5,6 @@ gem 'narray', :git => "https://github.com/tonyarnold/narray"
|
|||||||
gem 'gsl', :git => "https://github.com/tonyarnold/rb-gsl"
|
gem 'gsl', :git => "https://github.com/tonyarnold/rb-gsl"
|
||||||
|
|
||||||
gem 'html-proofer'
|
gem 'html-proofer'
|
||||||
|
|
||||||
|
gem 'bourbon'
|
||||||
|
gem 'neat'
|
||||||
|
@ -15,6 +15,9 @@ GEM
|
|||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
blankslate (2.1.2.4)
|
blankslate (2.1.2.4)
|
||||||
|
bourbon (4.0.2)
|
||||||
|
sass (~> 3.3)
|
||||||
|
thor
|
||||||
celluloid (0.16.0)
|
celluloid (0.16.0)
|
||||||
timers (~> 4.0.0)
|
timers (~> 4.0.0)
|
||||||
classifier-reborn (2.0.1)
|
classifier-reborn (2.0.1)
|
||||||
@ -69,6 +72,9 @@ GEM
|
|||||||
rb-inotify (>= 0.9)
|
rb-inotify (>= 0.9)
|
||||||
mercenary (0.3.4)
|
mercenary (0.3.4)
|
||||||
mini_portile (0.6.0)
|
mini_portile (0.6.0)
|
||||||
|
neat (1.6.0)
|
||||||
|
bourbon (>= 3.1)
|
||||||
|
sass (>= 3.3)
|
||||||
nokogiri (1.6.3.1)
|
nokogiri (1.6.3.1)
|
||||||
mini_portile (= 0.6.0)
|
mini_portile (= 0.6.0)
|
||||||
octopress (3.0.0.rc.15)
|
octopress (3.0.0.rc.15)
|
||||||
@ -101,6 +107,7 @@ GEM
|
|||||||
redcarpet (3.1.2)
|
redcarpet (3.1.2)
|
||||||
safe_yaml (1.0.4)
|
safe_yaml (1.0.4)
|
||||||
sass (3.4.5)
|
sass (3.4.5)
|
||||||
|
thor (0.19.1)
|
||||||
timers (4.0.1)
|
timers (4.0.1)
|
||||||
hitimes
|
hitimes
|
||||||
titlecase (0.1.1)
|
titlecase (0.1.1)
|
||||||
@ -115,7 +122,9 @@ PLATFORMS
|
|||||||
ruby
|
ruby
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
|
bourbon
|
||||||
gsl!
|
gsl!
|
||||||
html-proofer
|
html-proofer
|
||||||
narray!
|
narray!
|
||||||
|
neat
|
||||||
octopress (~> 3.0.0.rc.15)
|
octopress (~> 3.0.0.rc.15)
|
||||||
|
@ -8,3 +8,6 @@ lsi: true
|
|||||||
markdown: redcarpet
|
markdown: redcarpet
|
||||||
permalink: blog/:title
|
permalink: blog/:title
|
||||||
exclude: [Gemfile, Gemfile.lock, vendor]
|
exclude: [Gemfile, Gemfile.lock, vendor]
|
||||||
|
gems: [bourbon, neat]
|
||||||
|
sass:
|
||||||
|
style: compressed
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
@import "susy";
|
@import "bourbon";
|
||||||
|
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: Typewriter;
|
font-family: Typewriter;
|
||||||
@ -8,13 +8,14 @@
|
|||||||
$serif: 'PT Serif', 'Georgia', serif;
|
$serif: 'PT Serif', 'Georgia', serif;
|
||||||
$typewriter: Typewriter,"Georgia","Times",serif;
|
$typewriter: Typewriter,"Georgia","Times",serif;
|
||||||
|
|
||||||
$total-columns : 4;
|
// Layout
|
||||||
$column-width : 4em;
|
$max-width: em(624) !default;
|
||||||
$gutter-width : 1em;
|
$grid-columns: 8;
|
||||||
$grid-padding : $gutter-width;
|
$column: 4em;
|
||||||
|
$gutter: 1em;
|
||||||
|
|
||||||
$container-style: magic;
|
//$visual-grid: true;
|
||||||
|
|
||||||
$show-grid-backgrounds : true;
|
@import "neat";
|
||||||
|
|
||||||
$break: 8;
|
$mobile: new-breakpoint(max-width 500px 4);
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
@import "base";
|
|
||||||
|
|
||||||
body {
|
body {
|
||||||
color: #343434;
|
color: #343434;
|
||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
@ -22,23 +20,28 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.container {
|
.container {
|
||||||
@include container($total-columns, $break);
|
@include outer-container;
|
||||||
|
|
||||||
#header {
|
#header {
|
||||||
header {
|
header {
|
||||||
|
@include span-columns(2);
|
||||||
h1 {
|
h1 {
|
||||||
a {
|
a {
|
||||||
color: #343434;
|
color: #343434;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@include media($mobile) {
|
||||||
|
@include span-columns(4);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
nav {
|
nav {
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
|
line-height: 3em;
|
||||||
|
@include span-columns(6);
|
||||||
ul.navigation {
|
ul.navigation {
|
||||||
border-left: 4px solid #dedede;
|
border-left: 1px solid #dedede;
|
||||||
padding-left: 0.5em;
|
padding-left: 1em;
|
||||||
|
|
||||||
li {
|
li {
|
||||||
display: inline;
|
display: inline;
|
||||||
@ -50,6 +53,14 @@ body {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@include media($mobile) {
|
||||||
|
@include span-columns(4);
|
||||||
|
line-height: 1em;
|
||||||
|
ul.navigation {
|
||||||
|
border-left: 4px solid #dedede;
|
||||||
|
padding-left: 0.5em;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -86,10 +97,18 @@ body {
|
|||||||
clear: both;
|
clear: both;
|
||||||
border-bottom: 1px solid #dedede;
|
border-bottom: 1px solid #dedede;
|
||||||
line-height: 2;
|
line-height: 2;
|
||||||
|
time {
|
||||||
time {
|
display: block;
|
||||||
display: none;
|
float: left;
|
||||||
|
width: 8em;
|
||||||
|
color: #696969;
|
||||||
}
|
}
|
||||||
|
@include media($mobile) {
|
||||||
|
time {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.vcard {
|
.vcard {
|
||||||
@ -98,7 +117,6 @@ body {
|
|||||||
clear: both;
|
clear: both;
|
||||||
|
|
||||||
p {
|
p {
|
||||||
font-size: 16px;
|
|
||||||
margin: 0 0 0.5em 0;
|
margin: 0 0 0.5em 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -112,36 +130,3 @@ body {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@include at-breakpoint($break) {
|
|
||||||
body .container {
|
|
||||||
#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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1 +0,0 @@
|
|||||||
@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 h1{font-family:Typewriter,"Georgia","Times",serif}body img.left{float:left;margin:0 1em 1em 0}body img.right{float:right;margin:0 0 1em 1em}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 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{margin-bottom:1em;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}}
|
|
5
stylesheets/screen.scss
Normal file
5
stylesheets/screen.scss
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
# This triggers Jekyll sass conversion
|
||||||
|
---
|
||||||
|
@import "base";
|
||||||
|
@import "style";
|
Loading…
x
Reference in New Issue
Block a user