From 0a11b5bd4e5291b7a6c8ce3e1c0658c851285545 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Fri, 23 Sep 2016 17:50:29 +0200 Subject: de to Jekyll 3.2.x --- blog/_assets/stylesheets/_post.scss | 4 ++-- blog/_config.yml | 5 ++++- blog/_includes/post-excerpt.html | 4 ++-- blog/_includes/post-header.html | 4 +++- blog/_includes/sponsors.html | 16 ++++++++-------- blog/_plugins/jekyll_assets.rb | 1 - blog/_plugins/jekyll_multiple_languages.rb | 22 ---------------------- blog/_plugins/page_title.rb | 3 +-- 8 files changed, 20 insertions(+), 39 deletions(-) delete mode 100644 blog/_plugins/jekyll_assets.rb delete mode 100644 blog/_plugins/jekyll_multiple_languages.rb (limited to 'blog') 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 %}
- {% include post-header.html post = post%} + {% include post-header.html post = post %}
{{ post.excerpt }} -

{% t global.read_more %}

+

{% t global.read_more %}

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 @@
{{ post.date | date_to_string }}

- {{ post.title }} + + {{ post.title }} +

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 @@ 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] -- cgit v1.2.3