de to Jekyll 3.2.x

8 files changed, 20 insertions, 39 deletions

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]