Update Gemfile. Add include for Typekit.

8 files changed, 96 insertions, 65 deletions

diff --git a/Gemfile b/Gemfile
index 8bc7997..bcf531c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "guard-haml"
+#gem "guard-haml"
 gem "guard-sass"
 gem "bootstrap-sass"
 gem "redcarpet"
diff --git a/Gemfile.lock b/Gemfile.lock
index 9871e67..8ba46fb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,80 +1,103 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    bootstrap-sass (3.1.1.1)
-      sass (~> 3.2)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
-    classifier (1.3.4)
-      fast-stemmer (>= 1.0.0)
+    autoprefixer-rails (5.2.1.1)
+      execjs
+      json
+    blankslate (2.1.2.4)
+    bootstrap-sass (3.3.5.1)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.3.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    classifier-reborn (2.0.3)
+      fast-stemmer (~> 1.0)
     coderay (1.1.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.9.1.1)
     colorator (0.1)
-    commander (4.1.6)
-      highline (~> 1.6.11)
-    directory_watcher (1.4.1)
+    execjs (2.5.2)
     fast-stemmer (1.0.2)
-    ffi (1.9.3)
-    font-awesome-sass (4.0.3.1)
+    ffi (1.9.10)
+    font-awesome-sass (4.3.2.1)
       sass (~> 3.2)
-    formatador (0.2.4)
-    guard (2.6.0)
+    formatador (0.2.5)
+    guard (2.13.0)
       formatador (>= 0.2.4)
-      listen (~> 2.7)
+      listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
       pry (>= 0.9.12)
+      shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-haml (1.1.1)
-      guard (~> 2.0)
-      haml (>= 3.0)
-    guard-sass (1.4.0)
-      guard (>= 1.1.0)
+    guard-sass (1.6.0)
+      guard (>= 2.8.0)
       sass (>= 3.1)
-    haml (4.0.5)
-      tilt
-    highline (1.6.21)
-    jekyll (1.0.4)
-      classifier (~> 1.3)
+    hitimes (1.2.2)
+    jekyll (2.5.3)
+      classifier-reborn (~> 2.0)
       colorator (~> 0.1)
-      commander (~> 4.1.3)
-      directory_watcher (~> 1.4.1)
-      kramdown (~> 1.0.2)
-      liquid (~> 2.5.1)
-      maruku (~> 0.5)
-      pygments.rb (~> 0.5.0)
-      safe_yaml (~> 0.7.0)
-    kramdown (1.0.2)
-    liquid (2.5.5)
-    listen (2.7.3)
-      celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 2.6.1)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.6.0)
+      redcarpet (~> 3.1)
+      safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    jekyll-coffeescript (1.0.1)
+      coffee-script (~> 2.2)
+    jekyll-gist (1.3.0)
+    jekyll-paginate (1.1.0)
+    jekyll-sass-converter (1.3.0)
+      sass (~> 3.2)
+    jekyll-watch (1.2.1)
+      listen (~> 2.7)
+    json (1.8.3)
+    kramdown (1.8.0)
+    liquid (2.6.3)
+    listen (2.10.1)
+      celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lumberjack (1.0.5)
-    maruku (0.7.1)
+    lumberjack (1.0.9)
+    mercenary (0.3.5)
     method_source (0.8.2)
-    nio4r (1.0.0)
-    posix-spawn (0.3.8)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    nenv (0.2.0)
+    notiffany (0.0.8)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    posix-spawn (0.3.11)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pygments.rb (0.5.4)
+    pygments.rb (0.6.3)
       posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.4)
+      yajl-ruby (~> 1.2.0)
+    rb-fsevent (0.9.5)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    redcarpet (3.1.1)
-    safe_yaml (0.7.1)
-    sass (3.3.6)
-    slop (3.5.0)
+    redcarpet (3.3.2)
+    safe_yaml (1.0.4)
+    sass (3.4.16)
+    shellany (0.0.1)
+    slop (3.6.0)
     thor (0.19.1)
-    tilt (2.0.1)
-    timers (1.1.0)
-    yajl-ruby (1.1.0)
+    timers (4.0.1)
+      hitimes
+    toml (0.1.2)
+      parslet (~> 1.5.0)
+    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby
@@ -82,7 +105,9 @@ PLATFORMS
 DEPENDENCIES
   bootstrap-sass
   font-awesome-sass
-  guard-haml
   guard-sass
   jekyll
   redcarpet
+
+BUNDLED WITH
+   1.10.6
diff --git a/_config.yml b/_config.yml
index e87f254..6c8e3c5 100644
--- a/_config.yml
+++ b/_config.yml
@@ -13,7 +13,7 @@ paginate: 15
 
 future:      true
 lsi:         false
-pygments:    true
+highlighter: pygments
 permalink:   date
 markdown: redcarpet
 
@@ -41,3 +41,7 @@ kramdown:
     coderay_tab_width: 4
     coderay_bold_every: 10
     coderay_css: style
+
+gems:
+- bootstrap-sass
+- font-awesome-sass
diff --git a/_includes/typekit.html b/_includes/typekit.html
new file mode 100644
index 0000000..da91b42
--- /dev/null
+++ b/_includes/typekit.html
@@ -0,0 +1,2 @@
+<script src="https://use.typekit.net/zlp1low.js"></script>
+<script>try{Typekit.load({ async: true });}catch(e){}</script>
diff --git a/_layouts/post.html b/_layouts/post.html
index f29c132..dd4f1a9 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -71,5 +71,6 @@
     </script>
     <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
 
+    {% include typekit.html %}
   </body>
 </html>
diff --git a/_layouts/static.html b/_layouts/static.html
index e98927d..f7ab6e0 100644
--- a/_layouts/static.html
+++ b/_layouts/static.html
@@ -54,12 +54,9 @@
             </li>
           {% endif %}
         </ul>
-
       </div>
-
     </div>
 
-
-
+    {% include typekit.html %}
   </body>
 </html>
diff --git a/_sass/variables.sass b/_sass/variables.sass
index e9e1cbe..a3501d3 100644
--- a/_sass/variables.sass
+++ b/_sass/variables.sass
@@ -1,4 +1,6 @@
 $font-family-sans-serif: "Open Sans", "Helvetica Neue", "Arial", sans-serif
+$font-family-serif: "calluna", Georgia, serif
+$font-family-base: $font-family-serif
 $font-size-base: 18px
 $headings-font-weight: 200
 $brand-primary: #ac1905
diff --git a/rss.xml b/rss.xml
index 20ad845..808f0d1 100644
--- a/rss.xml
+++ b/rss.xml
@@ -1,5 +1,5 @@
 ---
-layout: nil
+layout: null
 ---
 <?xml version="1.0"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">