From: Mark Otto Date: Sun, 19 Apr 2015 05:44:30 +0000 (-0700) Subject: Merge branch 'master' into sass X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=a2c21c2b8f7ffb188bc84c39c1aa1cf4bbb716ae;p=blog Merge branch 'master' into sass --- a2c21c2b8f7ffb188bc84c39c1aa1cf4bbb716ae diff --cc _config.yml index 34baf41,49fbc1b..5a14f8e --- a/_config.yml +++ b/_config.yml @@@ -9,26 -3,17 +9,26 @@@ permalink: prett relative_permalinks: true # Setup -title: Poole -tagline: The Jekyll Butler -url: http://getpoole.com -paginate: 1 -basename: "" +title: Poole +tagline: The Jekyll Butler +url: http://getpoole.com +paginate: 1 - baseurl: / ++baseurl: "" + +# Assets +# +# We specify the directory for Jekyll so we can use @imports. +sass: + sass_dir: _sass + style: :compressed + +# About/contact author: - name: Mark Otto - url: https://twitter.com/mdo - email: markdotto@gmail.com + name: Mark Otto + url: https://twitter.com/mdo + email: markdotto@gmail.com # Custom vars -version: 1.0.0 +version: 1.0.0 github: - repo: https://github.com/poole/poole + repo: https://github.com/poole/poole diff --cc _includes/head.html index 8962bbb,f530a7f..61d5dd9 --- a/_includes/head.html +++ b/_includes/head.html @@@ -14,12 -14,13 +14,12 @@@ - - - ++ - - + + - +