de to Jekyll 3.2.x

10 files changed, 71 insertions, 122 deletions

diff --git a/Gemfile b/Gemfile
index a803013..ad67e05 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,8 +2,12 @@ source "https://rubygems.org"
 
 # Jekyll and useful plugins
 gem 'jekyll'
-gem 'jekyll-assets'
-gem 'jekyll-multiple-languages-plugin'
+
+group :jekyll_plugins do
+  gem 'jekyll-assets'
+  gem 'jekyll-multiple-languages-plugin'
+end
 
 # Other useful gems
 gem 'facets', :require => false
+gem 'mini_magick', :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index 870d1e2..a3f0dfa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,95 +1,58 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.8)
-    blankslate (2.1.2.4)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    classifier-reborn (2.0.3)
-      fast-stemmer (~> 1.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.9.1.1)
-    colorator (0.1)
-    execjs (2.5.2)
-    facets (3.0.0)
-    fast-stemmer (1.0.2)
-    fastimage (1.7.0)
-      addressable (~> 2.3, >= 2.3.5)
-    ffi (1.9.10)
-    hike (1.2.3)
-    hitimes (1.2.2)
-    jekyll (2.5.3)
-      classifier-reborn (~> 2.0)
-      colorator (~> 0.1)
-      jekyll-coffeescript (~> 1.0)
-      jekyll-gist (~> 1.0)
-      jekyll-paginate (~> 1.0)
+    addressable (2.4.0)
+    colorator (1.1.0)
+    concurrent-ruby (1.0.2)
+    extras (0.1.0)
+      forwardable-extended (~> 2.5)
+    facets (3.1.0)
+    fastimage (2.0.0)
+      addressable (~> 2)
+    ffi (1.9.14)
+    forwardable-extended (2.6.0)
+    jekyll (3.2.1)
+      colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
-      liquid (~> 2.6.1)
+      liquid (~> 3.0)
       mercenary (~> 0.3.3)
-      pygments.rb (~> 0.6.0)
-      redcarpet (~> 3.1)
+      pathutil (~> 0.9)
+      rouge (~> 1.7)
       safe_yaml (~> 1.0)
-      toml (~> 0.1.0)
-    jekyll-assets (1.0.0)
-      fastimage (~> 1.6)
-      jekyll (>= 2)
-      mini_magick (~> 4.1)
-      sass (~> 3.2)
-      sprockets (~> 2.10)
-      sprockets-helpers
-      sprockets-sass
-    jekyll-coffeescript (1.0.1)
-      coffee-script (~> 2.2)
-    jekyll-gist (1.2.1)
-    jekyll-multiple-languages-plugin (1.2.9)
-    jekyll-paginate (1.1.0)
-    jekyll-sass-converter (1.3.0)
-      sass (~> 3.2)
-    jekyll-watch (1.2.1)
-      listen (~> 2.7)
-    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)
-    mercenary (0.3.5)
+    jekyll-assets (2.2.8)
+      extras (~> 0.1)
+      fastimage (~> 2.0, >= 1.8)
+      jekyll (~> 3.1, >= 3.0)
+      pathutil (>= 0.8)
+      rack (> 1, < 2)
+      sprockets (~> 3.3, < 3.7)
+    jekyll-multiple-languages-plugin (1.5.1)
+      jekyll (>= 2.0, < 4.0)
+    jekyll-sass-converter (1.4.0)
+      sass (~> 3.4)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    kramdown (1.12.0)
+    liquid (3.0.6)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    mercenary (0.3.6)
     mini_magick (4.2.10)
-    multi_json (1.11.2)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    posix-spawn (0.3.11)
-    pygments.rb (0.6.3)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
+    pathutil (0.14.0)
+      forwardable-extended (~> 2.6)
     rack (1.6.4)
-    rb-fsevent (0.9.5)
-    rb-inotify (0.9.5)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    redcarpet (3.3.2)
+    rouge (1.11.1)
     safe_yaml (1.0.4)
-    sass (3.4.16)
-    sprockets (2.12.4)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-helpers (1.2.1)
-      sprockets (>= 2.2)
-    sprockets-sass (1.3.1)
-      sprockets (~> 2.0)
-      tilt (~> 1.1)
-    tilt (1.4.1)
-    timers (4.0.1)
-      hitimes
-    toml (0.1.2)
-      parslet (~> 1.5.0)
-    yajl-ruby (1.2.1)
+    sass (3.4.22)
+    sprockets (3.6.3)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
 
 PLATFORMS
   ruby
@@ -99,6 +62,7 @@ DEPENDENCIES
   jekyll
   jekyll-assets
   jekyll-multiple-languages-plugin
+  mini_magick
 
 BUNDLED WITH
-   1.10.6
+   1.12.5
diff --git a/blog/_assets/stylesheets/_post.scss b/blog/_assets/stylesheets/_post.scss
index 6278c17..bbb924e 100644
--- a/blog/_assets/stylesheets/_post.scss
+++ b/blog/_assets/stylesheets/_post.scss
@@ -6,7 +6,7 @@
     }
     h1 {
         font: {
-            size: 13pt;
+            size: 16pt;
             weight: bold;
         }
         margin: {
@@ -26,4 +26,4 @@
     background-color: transparentize(#182530, 0.3);
     padding: 2mm;
     margin-bottom: 2mm;
-}
\ No newline at end of file
+}
diff --git a/blog/_config.yml b/blog/_config.yml
index 392234b..ddba4be 100644
--- a/blog/_config.yml
+++ b/blog/_config.yml
@@ -2,7 +2,10 @@
 languages: ["nb", "en"]
 exclude_from_localizations: ["assets", "css"]
 title: Norsk Urskog
-paginate: 5
+
+gems:
+  - jekyll-assets
+  - jekyll-multiple-languages-plugin
 
 collections:
   concerts:
diff --git a/blog/_includes/post-excerpt.html b/blog/_includes/post-excerpt.html
index 73c4478..125e984 100644
--- a/blog/_includes/post-excerpt.html
+++ b/blog/_includes/post-excerpt.html
@@ -1,9 +1,9 @@
 {% assign post = include.post %}
 <article class="post">
-  {% include post-header.html post = post%}
+  {% include post-header.html post = post %}
   <section class="post-body">
     {{ post.excerpt }}
 
-    <p><a href="{{ post.url }}">{% t global.read_more %}</a></p>
+    <p><a href="{{ post.url | prepend: site.baseurl }}">{% t global.read_more %}</a></p>
   </section>
 </article>
diff --git a/blog/_includes/post-header.html b/blog/_includes/post-header.html
index e1baeb8..2cb82b1 100644
--- a/blog/_includes/post-header.html
+++ b/blog/_includes/post-header.html
@@ -2,6 +2,8 @@
 <header class="post-header">
   <date>{{ post.date | date_to_string }}</date>
   <h1>
-    <a href="{{ post.url }}">{{ post.title }}</a>
+    <a href="{{ post.url | prepend: site.baseurl }}">
+      {{ post.title }}
+    </a>
   </h1>
 </header>
diff --git a/blog/_includes/sponsors.html b/blog/_includes/sponsors.html
index b63d497..ff6d62d 100644
--- a/blog/_includes/sponsors.html
+++ b/blog/_includes/sponsors.html
@@ -4,46 +4,46 @@
   <div class="sponsor-logos large">
     <span class="logo">
       <a href="http://ds-media.no">
-        {% image "2014/sponsors/ds_banner_2014.jpg" alt="DS-Media" %}
+        {% image "2014/sponsors/ds_banner_2014.jpg" alt="DS-Media" magick:resize:224x %}
       </a>
     </span>
   </div>
   <div class="sponsor-logos large">
     <span class="logo">
       <a href="http://trineogkim.no/">
-        {% image "logos/tkds_logo.png" alt="Trine og Kim Design Studio" %}
+        {% image "logos/tkds_logo.png" alt="Trine og Kim Design Studio" magick:resize:224x %}
       </a>
     </span>
     <span class="logo">
       <a href="http://negativevibe.net">
-        {% image logos/nvr_logo_web_430.png alt="Negative Vibe Records" [resize:224x] %}
+        {% image logos/nvr_logo_web_430.png alt="Negative Vibe Records" magick:resize:224x %}
       </a>
     </span>
     <span class="logo">
       <a href="http://www.symphonium.no/">
-        {% image "2014/sponsors/Symphonium_2014.png" alt="Symphonium Metal Radio" %}
+        {% image "2014/sponsors/Symphonium_2014.png" alt="Symphonium Metal Radio" magick:resize:224x %}
       </a>
     </span>
   </div>
   <div class="sponsor-logos">
     <span class="logo">
       <a href="http://heavymetal.no">
-        {% image "logos/hmno_logo.png" alt="Heavymetal.no" [resize:224x] %}
+        {% image "logos/hmno_logo.png" alt="Heavymetal.no" magick:resize:224x %}
       </a>
     </span>
     <span class="logo">
       <a href="http://www.eternal-terror.com">
-        {% image "logos/ET_logo_2.png" alt="Eternal-Terror Webzine" [resize:224x] %}
+        {% image "logos/ET_logo_2.png" alt="Eternal-Terror Webzine" magick:resize:224x %}
       </a>
     </span>
     <span class="logo">
       <a href="http://www.fotograf-lovberg.no/">
-        {% image "2014/sponsors/fotograf-lovberg_2014.png" alt="Fotograf Løvberg" %}
+        {% image "2014/sponsors/fotograf-lovberg_2014.png" alt="Fotograf Løvberg" magick:resize:224x %}
       </a>
     </span>
     <span class="logo">
       <a href="http://turbine.no/">
-        {% image "2014/sponsors/turbine_2014.png" alt="Turbine Agency" %}
+        {% image "2014/sponsors/turbine_2014.png" alt="Turbine Agency" magick:resize:224x %}
       </a>
     </span>
   </div>
diff --git a/blog/_plugins/jekyll_assets.rb b/blog/_plugins/jekyll_assets.rb
deleted file mode 100644
index 320122a..0000000
--- a/blog/_plugins/jekyll_assets.rb
+++ /dev/null
@@ -1 +0,0 @@
-require "jekyll/assets"
diff --git a/blog/_plugins/jekyll_multiple_languages.rb b/blog/_plugins/jekyll_multiple_languages.rb
deleted file mode 100644
index 4b1afe8..0000000
--- a/blog/_plugins/jekyll_multiple_languages.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'jekyll/multiple/languages/plugin'
-
-# Monkey patch a few functions in Jekyll#Post to make this work...
-# Should probably try to upstream this instead.
-#
-module Jekyll
-  class Post
-    alias url_orig url
-    def url
-      # Drop the _i18n prefix of the generated url
-      url_orig.gsub("_i18n/", '')
-    end
-
-    alias destination_orig destination
-    def destination(dest)
-      # Drop extra lang prefix if it occurs multiple times.
-      # For all but the default language it is defined both in the
-      # dest directory and the post url. That's one too many.
-      destination_orig(dest).sub(/#{site.config['lang']}\/#{site.config['lang']}/, "#{site.config['lang']}")
-    end
-  end
-end
diff --git a/blog/_plugins/page_title.rb b/blog/_plugins/page_title.rb
index 039e859..3c835fd 100644
--- a/blog/_plugins/page_title.rb
+++ b/blog/_plugins/page_title.rb
@@ -1,4 +1,3 @@
-require "jekyll/multiple/languages/plugin"
 require "facets/kernel/silence"
 
 module Jekyll
@@ -10,7 +9,7 @@ module Jekyll
 
     def render(context)
       text = silently do
-        t = Jekyll::LocalizeTag.new('t', @key, '')
+        t = Jekyll::LocalizeTag.parse('t', @key, '', {})
         t.render(context)
       end
       text || context[@key]