Upgrade Jekyll, etc.

lenskit · Sep 22, 2014 · eb1c648 · eb1c648
1 parent 657e83a
commit eb1c648
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 2,623 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
 gem 'github-pages'
-gem 'sass'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,91 +2,111 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (4.1.2)
+    activesupport (4.1.6)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    blankslate (2.1.3)
-    classifier (1.3.4)
-      fast-stemmer (>= 1.0.0)
+    blankslate (2.1.2.4)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    classifier-reborn (2.0.1)
+      fast-stemmer (~> 1.0)
+    coffee-script (2.3.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.8.0)
     colorator (0.1)
-    commander (4.1.6)
-      highline (~> 1.6.11)
+    execjs (2.2.1)
     fast-stemmer (1.0.2)
     ffi (1.9.3)
-    gemoji (1.5.0)
-    github-pages (19)
+    gemoji (2.1.0)
+    github-pages (27)
       RedCloth (= 4.2.9)
-      jekyll (= 1.5.1)
-      jekyll-mentions (= 0.0.6)
-      jekyll-redirect-from (= 0.3.1)
-      jekyll-sitemap (= 0.3.0)
-      jemoji (= 0.1.0)
+      jekyll (= 2.3.0)
+      jekyll-coffeescript (= 1.0.0)
+      jekyll-mentions (= 0.1.3)
+      jekyll-redirect-from (= 0.6.2)
+      jekyll-sass-converter (= 1.2.0)
+      jekyll-sitemap (= 0.6.0)
+      jemoji (= 0.3.0)
       kramdown (= 1.3.1)
-      liquid (= 2.5.5)
+      liquid (= 2.6.1)
       maruku (= 0.7.0)
+      pygments.rb (= 0.6.0)
       rdiscount (= 2.1.7)
-      redcarpet (= 2.3.0)
-    highline (1.6.21)
-    html-pipeline (1.5.0)
+      redcarpet (= 3.1.2)
+    hitimes (1.2.2)
+    html-pipeline (1.9.0)
       activesupport (>= 2)
       nokogiri (~> 1.4)
-    i18n (0.6.9)
-    jekyll (1.5.1)
-      classifier (~> 1.3)
+    i18n (0.6.11)
+    jekyll (2.3.0)
+      classifier-reborn (~> 2.0)
       colorator (~> 0.1)
-      commander (~> 4.1.3)
-      liquid (~> 2.5.5)
-      listen (~> 1.3)
-      maruku (= 0.7.0)
-      pygments.rb (~> 0.5.0)
-      redcarpet (~> 2.3.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-mentions (0.0.6)
-      html-pipeline (~> 1.5.0)
-      jekyll (~> 1.4)
-    jekyll-redirect-from (0.3.1)
-      jekyll (~> 1.4)
-    jekyll-sitemap (0.3.0)
-      jekyll (~> 1.4)
-    jemoji (0.1.0)
-      gemoji (~> 1.5.0)
-      html-pipeline (~> 1.5.0)
-      jekyll (~> 1.4)
+    jekyll-coffeescript (1.0.0)
+      coffee-script (~> 2.2)
+    jekyll-gist (1.1.0)
+    jekyll-mentions (0.1.3)
+      html-pipeline (~> 1.9.0)
+      jekyll (~> 2.0)
+    jekyll-paginate (1.0.0)
+    jekyll-redirect-from (0.6.2)
+      jekyll (~> 2.0)
+    jekyll-sass-converter (1.2.0)
+      sass (~> 3.2)
+    jekyll-sitemap (0.6.0)
+    jekyll-watch (1.1.1)
+      listen (~> 2.7)
+    jemoji (0.3.0)
+      gemoji (~> 2.0)
+      html-pipeline (~> 1.9)
+      jekyll (~> 2.0)
     json (1.8.1)
     kramdown (1.3.1)
-    liquid (2.5.5)
-    listen (1.3.1)
+    liquid (2.6.1)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
     maruku (0.7.0)
+    mercenary (0.3.4)
     mini_portile (0.6.0)
-    minitest (5.3.5)
-    nokogiri (1.6.2.1)
+    minitest (5.4.1)
+    nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    posix-spawn (0.3.8)
-    pygments.rb (0.5.4)
+    posix-spawn (0.3.9)
+    pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.3)
-      ffi (>= 0.5.0)
     rdiscount (2.1.7)
-    redcarpet (2.3.0)
+    redcarpet (3.1.2)
     safe_yaml (1.0.3)
-    sass (3.3.8)
+    sass (3.4.5)
     thread_safe (0.3.4)
+    timers (4.0.1)
+      hitimes
     toml (0.1.1)
       parslet (~> 1.5.0)
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     yajl-ruby (1.1.0)
 
@@ -95,4 +115,3 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages
-  sass
diff --git a/_config.yml b/_config.yml
@@ -1,6 +1,3 @@
-gems:
-  - jekyll-sitemap
-
 exclude:
   - Gemfile
   - Gemfile.lock
@@ -26,3 +23,7 @@ markdown: kramdown
 kramdown:
   input: kramdown
   hard_wrap: false
+
+sass:
+  load_paths:
+    - bower_components/foundation/scss
diff --git a/_includes/menu.html b/_includes/menu.html
@@ -1,10 +1,10 @@
-<nav class="top-bar">
+<nav class="top-bar" data-topbar role="navigation">
   <ul class="title-area">
-    <li class="name">
     {% if page.header.title != "hide" %}
+    <li class="name">
     <h1><a href="/">LensKit</a></h1>
-    {% endif %}
     </li>
+    {% endif %}
   </ul>
   <section class="top-bar-section" id="site-menu">
     <ul class="right">

diff --git a/_layouts/shell.html b/_layouts/shell.html
@@ -23,7 +23,7 @@
   {% include menu.html %}
 </div>
 {{content}}
-<footer class="row">
+<footer>
   {% include footer.html %}
 </footer>
 <script src="/bower_components/jquery/dist/jquery.min.js"></script>

diff --git a/_scss/_settings.scss → _sass/_settings.scss b/_scss/_settings.scss → _sass/_settings.scss
@@ -33,6 +33,7 @@
 // Grid
 
 // $include-html-grid-classes: $include-html-classes;
+$include-html-grid-classes: true;
 // $include-xl-html-grid-classes: false;
 
 // $row-width: 1300px;