Merge branch 'release/3.2.3'

The comment system can be changed to embed topics from the Discourse
forum software: http://discourse.org/

More details: https://meta.discourse.org/t/embedding-discourse-comments-via-javascript/31963

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,45 @@
+<!--
+  Before submitting please search open and closed issues at 
+  https://github.com/mmistakes/minimal-mistakes/issues to avoid duplication.
+
+  Feel free to use the following as a template and remove or add fields as you see fit. You can convert `[ ]` into `[x]` to check boxes.
+-->
+
+- [ ] This is a question about using the theme.
+- [ ] I believe this to be a bug with the theme --- not Jekyll, GitHub Pages or one of the bundled plugins.
+- [ ] This is a feature request.
+- [ ] I have updated all gems with `bundle update`.
+- [ ] I have tested locally with `bundle exec jekyll build`.
+
+---
+
+## Environment informations
+
+<!--
+  Please include theme version, `github-pages --version`, and the operating system you are on or tested with.
+-->
+
+- **Minimal Mistakes version:** 
+- **`github-pages` or `jekyll` gem version:** 
+- **Operating system:** 
+
+
+---
+
+## Expected behavior
+
+<!--
+  Describe the intended output or what you expected to see.
+-->
+
+## Steps to reproduce the behavior
+
+<!--
+  Include a link to a public repository or ZIP file so that they can more easily be reproduced. Being able to see your actual files helps troubleshooting as most issues stem from missing YAML Front Matter, a mis-configured `_config.sys` file, or `_posts` content. 
+
+  Describe the steps you took for this problem to exist. Such as you cloned the theme, customized `_config.yml`, added your own posts, and started up a Jekyll server locally.
+
+  If an error occurred on GitHub Pages when pushing, please build locally and provide a complete log by running `bundle exec jekyll --trace --verbose` and including this output in the filed issue.
+
+  Screenshots can also be included if they help illustrate a behavior.
+-->

CHANGELOG.md

@@ -1,3 +1,103 @@
+## [3.2.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.3)
+
+### Enhancement
+
+- Add [Discourse](https://www.discourse.org/) as a commenting provider [#335](https://github.com/mmistakes/minimal-mistakes/pull/335)
+
+## [3.2.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.2)
+
+### Enhancement
+
+- Add support for image captions in Magnific Popup overlays via the [`gallery`](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#gallery) helper [#334](https://github.com/mmistakes/minimal-mistakes/issues/334)
+
+## [3.2.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.1)
+
+### Bug Fixes
+
+- Remove need for "double tapping" masthead menu links on iOS devices. [#315](https://github.com/mmistakes/minimal-mistakes/issues/315)
+
+### Maintenance
+
+- Add `ISSUE_TEMPLATE.md` for improve issue submission process.
+
+## [3.2.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.0)
+
+### Bug Fixes
+
+- Fix missing category/tag links in post footer due to possible conflict with `site.tags` and `site.categories`. [#329](https://github.com/mmistakes/minimal-mistakes/issues/329#issuecomment-222375568)
+
+## [3.1.8](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.8)
+
+### Bug Fixes
+
+- Fix `Liquid Exception: undefined method 'gsub' for nil:NilClass in _layouts/single.html` error when `page.title` is null. `<h1>` element is now conditional if `title: ` is not set for a `page` or collection item. [#312](https://github.com/mmistakes/minimal-mistakes/issues/312)
+
+### Maintenance
+
+- Remove duplicate `fa-twitter` and `fa-twitter-square` classes from `_utilities.scss`. [#302](https://github.com/mmistakes/minimal-mistakes/issues/302)
+
+- Document installing additional Jekyll gem dependencies when using `gem "jekyll"` instead of `gem "github-pages"` to avoid any errors on run. [#305](https://github.com/mmistakes/minimal-mistakes/issues/305)
+
+## [3.1.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.7)
+
+### Enhancement
+
+- Add translation key for "Recent Posts" used in home page `index.html`. [#316](https://github.com/mmistakes/minimal-mistakes/pull/316)
+
+### Maintenance
+
+- Small fix to avoid underlying the whitespace between icons and related text when hovering. [#303](https://github.com/mmistakes/minimal-mistakes/pull/303)
+
+## [3.1.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.6)
+
+### Maintenance
+
+- Update gem dependencies. Run `bundle` to update `Gemfile.lock`.
+
+## [3.1.5](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.5)
+
+### Maintenance
+
+- Fix `www` and `https` links in author profile include [#293](https://github.com/mmistakes/minimal-mistakes/pull/293)
+
+## [3.1.4](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.4)
+
+### Enhancements
+
+- Add overlay_filter param to hero headers [#298](https://github.com/mmistakes/minimal-mistakes/pull/298)
+
+## [3.1.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.3)
+
+### Enhancements
+
+- Improve `site.locale` documentation [#284](https://github.com/mmistakes/minimal-mistakes/issues/284)
+- Remove ProTip note about protocol-less `site.url` as it is an anti-pattern [#288](https://github.com/mmistakes/minimal-mistakes/issues/288)
+
+### Bug Fixes
+
+- Fix `og_image` URL in seo.html [#277](https://github.com/mmistakes/minimal-mistakes/issues/277)
+- Fix `author_profile` toggle when assigned in a `_layout` [#285](https://github.com/mmistakes/minimal-mistakes/issues/285)
+- Fix typo in `build:all` npm script [#283](https://github.com/mmistakes/minimal-mistakes/pull/283)
+- Fix URL typo documentation [#287](https://github.com/mmistakes/minimal-mistakes/issues/287)
+- SEO author bug. If `twitter.username` is set and `author.twitter` is `nil` bad things happen. [#289](https://github.com/mmistakes/minimal-mistakes/issues/289)
+
+## [3.1.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.2)
+
+### Enhancement
+
+- Explain how to use `nav_list` helper in [documentation](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#navigation-list).
+- Reduce left/right padding on smaller screens to increase width of main content column.
+
+### Bug Fixes
+
+- Fix alignment issues with related posts [#273](https://github.com/mmistakes/minimal-mistakes/issues/273) and "Follow" button in author profile [#274](https://github.com/mmistakes/minimal-mistakes/issues/274).
+
+## [3.1.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.1)
+
+### Bug Fix
+
+- Fixed reading time bug when `words_per_minute` wasn't set in `_config.yml` [#271](https://github.com/mmistakes/minimal-mistakes/issues/271)
+
 ## [3.1.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.0)
 
 ### Enhancements
@@ -8,7 +108,6 @@
 ### Bug Fixes
 - Fixed Bitbucket URL typo in author sidebar.
 
->>>>>>> release/3.1.0
 ## [3.0.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.0.3)
 
 ### Enhancements

Gemfile.lock

@@ -1,7 +1,6 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
     activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
@@ -14,35 +13,32 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     colorator (0.1)
-    ethon (0.8.1)
+    ethon (0.9.0)
       ffi (>= 1.3.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.10)
     ffi (1.9.10-x64-mingw32)
     gemoji (2.1.0)
-    github-pages (69)
+    github-pages (80)
-      RedCloth (= 4.2.9)
       github-pages-health-check (= 1.1.0)
-      jekyll (= 3.0.3)
+      jekyll (= 3.1.6)
       jekyll-coffeescript (= 1.0.1)
-      jekyll-feed (= 0.4.0)
+      jekyll-feed (= 0.5.1)
       jekyll-gist (= 1.4.0)
-      jekyll-github-metadata (= 1.11.0)
+      jekyll-github-metadata (= 1.11.1)
       jekyll-mentions (= 1.1.2)
       jekyll-paginate (= 1.1.0)
       jekyll-redirect-from (= 0.10.0)
       jekyll-sass-converter (= 1.3.0)
-      jekyll-seo-tag (= 1.3.3)
+      jekyll-seo-tag (= 1.4.0)
       jekyll-sitemap (= 0.10.0)
-      jekyll-textile-converter (= 0.1.0)
       jemoji (= 0.6.2)
       kramdown (= 1.10.0)
       liquid (= 3.0.6)
+      listen (= 3.0.6)
       mercenary (~> 0.3)
-      rdiscount (= 2.1.8)
-      redcarpet (= 3.3.3)
       rouge (= 1.10.1)
       terminal-table (~> 1.4)
     github-pages-health-check (1.1.0)
@@ -51,11 +47,11 @@ GEM
       octokit (~> 4.0)
       public_suffix (~> 1.4)
       typhoeus (~> 0.7)
-    html-pipeline (2.4.0)
+    html-pipeline (2.4.1)
       activesupport (>= 2, < 5)
       nokogiri (>= 1.4)
     i18n (0.7.0)
-    jekyll (3.0.3)
+    jekyll (3.1.6)
       colorator (~> 0.1)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
@@ -66,10 +62,10 @@ GEM
       safe_yaml (~> 1.0)
     jekyll-coffeescript (1.0.1)
       coffee-script (~> 2.2)
-    jekyll-feed (0.4.0)
+    jekyll-feed (0.5.1)
     jekyll-gist (1.4.0)
       octokit (~> 4.2)
-    jekyll-github-metadata (1.11.0)
+    jekyll-github-metadata (1.11.1)
       octokit (~> 4.0)
     jekyll-mentions (1.1.2)
       html-pipeline (~> 2.3)
@@ -79,13 +75,11 @@ GEM
       jekyll (>= 2.0)
     jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
-    jekyll-seo-tag (1.3.3)
+    jekyll-seo-tag (1.4.0)
       jekyll (~> 3.0)
     jekyll-sitemap (0.10.0)
-    jekyll-textile-converter (0.1.0)
+    jekyll-watch (1.4.0)
-      RedCloth (~> 4.0)
+      listen (~> 3.0, < 3.1)
-    jekyll-watch (1.3.1)
-      listen (~> 3.0)
     jemoji (0.6.2)
       gemoji (~> 2.0)
       html-pipeline (~> 2.2)
@@ -98,7 +92,7 @@ GEM
       rb-inotify (>= 0.9.7)
     mercenary (0.3.6)
     mini_portile2 (2.0.0)
-    minitest (5.8.4)
+    minitest (5.9.0)
     multipart-post (2.0.0)
     net-dns (0.8.0)
     nokogiri (1.6.7.2)
@@ -111,8 +105,6 @@ GEM
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rdiscount (2.1.8)
-    redcarpet (3.3.3)
     rouge (1.10.1)
     safe_yaml (1.0.4)
     sass (3.4.22)
@@ -136,4 +128,4 @@ DEPENDENCIES
   wdm (~> 0.1.0)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

README.md

@@ -15,7 +15,7 @@ The theme includes responsive layouts (`single`, `archive`, and `splash` pages)
 
 ### Notable Features
 
-- Compatible with GitHub Pages
+- Compatible with Jekyll 3.x and GitHub Pages
 - Several layout options (single, archive, splash pages)
 - SEO optimized with support for [Twitter Cards](https://dev.twitter.com/cards/overview) and [Open Graph](http://ogp.me/) data
 - Optional header images, sidebars, table of contents, galleries, related posts, breadcrumb links, and more.

_config.yml

@@ -15,12 +15,14 @@ url                      : # the base hostname & protocol for your site e.g. "ht
 baseurl                  : # the subpath of your site, e.g. "/blog"
 gh_repo                  :
 teaser                   : # filename of teaser fallback teaser image placed in /images/, .e.g. "500x300.png"
-# breadcrumbs              : false # true, false (default)
+# breadcrumbs            : false # true, false (default)
-# words_per_minute         : 200
+words_per_minute         : 200
 comments:
-  provider               : # false (default), "disqus", "facebook", "google-plus", custom"
+  provider               : # false (default), "disqus", "discourse", "facebook", "google-plus", custom"
   disqus:
     shortname            : # https://help.disqus.com/customer/portal/articles/466208-what-s-a-shortname-
+  discourse:
+    server               : # https://meta.discourse.org/t/embedding-discourse-comments-via-javascript/31963 , e.g.: meta.discourse.org
   facebook:
     # https://developers.facebook.com/docs/plugins/comments
     appid                :
@@ -179,10 +181,10 @@ whitelist:
 #  - <base_path>/tags/my-awesome-tag/index.html ~> path: /tags/
 #  - <base_path/categories/my-awesome-category/index.html ~> path: /categories/
 #  - <base_path/my-awesome-category/index.html ~> path: /
-categories:
+category_archive:
   type: liquid
   path: /categories/
-tags:
+tag_archive:
   type: liquid
   path: /tags/
 # https://github.com/jekyll/jekyll-archives

_data/ui-text.yml

@@ -26,10 +26,11 @@ en: &DEFAULT_EN
   powered_by            : "Powered by"
   website_label         : "Website"
   email_label           : "Email"
+  recent_posts          : "Recent Posts"
 en-US:
   <<: *DEFAULT_EN
 en-UK:
   <<: *DEFAULT_EN
 
 # Another locale
-# --------------
+# --------------

_includes/archive-single.html

@@ -16,7 +16,7 @@
       {% if include.type == "grid" and teaser != blank %}
         <div class="archive__item-teaser">
           <img src=
-            {% if teaser contains "http" %}
+            {% if teaser contains "://" %}
               "{{ teaser }}"
             {% else %}
               "{{ teaser | prepend: "/images/" | prepend: base_path }}"

_includes/author-profile.html

@@ -7,7 +7,7 @@
 <div itemscope itemtype="http://schema.org/Person">
 
   <div class="author__avatar">
-    {% if author.avatar contains "http" %}
+    {% if author.avatar contains "://" %}
     	<img src="{{ author.avatar }}" alt="{{ author.name }}">
     {% else %}
     	<img src="{{ author.avatar | prepend: "/images/" | prepend: base_path }}" class="author__avatar" alt="{{ author.name }}">
@@ -35,64 +35,64 @@
         <li><a href="https://keybase.io/{{ author.keybase }}"><i class="fa fa-fw fa-key" aria-hidden="true"></i> Keybase</a></li>
       {% endif %}
       {% if author.twitter %}
-        <li><a href="http://twitter.com/{{ author.twitter }}"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+        <li><a href="https://twitter.com/{{ author.twitter }}"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
       {% endif %}
       {% if author.facebook %}
-        <li><a href="http://facebook.com/{{ author.facebook }}"><i class="fa fa-fw fa-facebook-square" aria-hidden="true"></i> Facebook</a></li>
+        <li><a href="https://www.facebook.com/{{ author.facebook }}"><i class="fa fa-fw fa-facebook-square" aria-hidden="true"></i> Facebook</a></li>
       {% endif %}
       {% if author.google_plus %}
-        <li><a href="http://plus.google.com/+{{ author.google_plus }}"><i class="fa fa-fw fa-google-plus-square" aria-hidden="true"></i> Google+</a></li>
+        <li><a href="https://plus.google.com/+{{ author.google_plus }}"><i class="fa fa-fw fa-google-plus-square" aria-hidden="true"></i> Google+</a></li>
       {% endif %}
       {% if author.linkedin %}
-        <li><a href="http://linkedin.com/in/{{ author.linkedin }}"><i class="fa fa-fw fa-linkedin-square" aria-hidden="true"></i> LinkedIn</a></li>
+        <li><a href="https://www.linkedin.com/in/{{ author.linkedin }}"><i class="fa fa-fw fa-linkedin-square" aria-hidden="true"></i> LinkedIn</a></li>
       {% endif %}
       {% if author.xing %}
-        <li><a href="http://www.xing.com/profile/{{ author.xing }}"><i class="fa fa-fw fa-xing-square" aria-hidden="true"></i> XING</a></li>
+        <li><a href="https://www.xing.com/profile/{{ author.xing }}"><i class="fa fa-fw fa-xing-square" aria-hidden="true"></i> XING</a></li>
       {% endif %}
       {% if author.instagram %}
-        <li><a href="http://instagram.com/{{ author.instagram }}"><i class="fa fa-fw fa-instagram" aria-hidden="true"></i> Instagram</a></li>
+        <li><a href="https://instagram.com/{{ author.instagram }}"><i class="fa fa-fw fa-instagram" aria-hidden="true"></i> Instagram</a></li>
       {% endif %}
       {% if author.tumblr %}
-        <li><a href="http://{{ author.tumblr }}.tumblr.com"><i class="fa fa-fw fa-tumblr-square" aria-hidden="true"></i> Tumblr</a></li>
+        <li><a href="https://{{ author.tumblr }}.tumblr.com"><i class="fa fa-fw fa-tumblr-square" aria-hidden="true"></i> Tumblr</a></li>
       {% endif %}
       {% if author.bitbucket %}
-        <li><a href="http://bitbucket.org/{{ author.bitbucket }}"><i class="fa fa-fw fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
+        <li><a href="https://bitbucket.org/{{ author.bitbucket }}"><i class="fa fa-fw fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
       {% endif %}
       {% if author.github %}
-        <li><a href="http://github.com/{{ author.github }}"><i class="fa fa-fw fa-github" aria-hidden="true"></i> Github</a></li>
+        <li><a href="https://github.com/{{ author.github }}"><i class="fa fa-fw fa-github" aria-hidden="true"></i> Github</a></li>
       {% endif %}
       {% if author.stackoverflow %}
-        <li><a href="http://stackoverflow.com/users/{{ author.stackoverflow }}"><i class="fa fa-fw fa-stack-overflow" aria-hidden="true"></i> Stackoverflow</a></li>
+        <li><a href="https://www.stackoverflow.com/users/{{ author.stackoverflow }}"><i class="fa fa-fw fa-stack-overflow" aria-hidden="true"></i> Stackoverflow</a></li>
       {% endif %}
       {% if author.lastfm %}
-        <li><a href="http://lastfm.com/user/{{ author.lastfm }}"><i class="fa fa-fw fa-lastfm-square" aria-hidden="true"></i> Last.fm</a></li>
+        <li><a href="https://lastfm.com/user/{{ author.lastfm }}"><i class="fa fa-fw fa-lastfm-square" aria-hidden="true"></i> Last.fm</a></li>
       {% endif %}
       {% if author.dribbble %}
-        <li><a href="http://dribbble.com/{{ author.dribbble }}"><i class="fa fa-fw fa-dribbble" aria-hidden="true"></i> Dribbble</a></li>
+        <li><a href="https://dribbble.com/{{ author.dribbble }}"><i class="fa fa-fw fa-dribbble" aria-hidden="true"></i> Dribbble</a></li>
       {% endif %}
       {% if author.pinterest %}
-        <li><a href="http://www.pinterest.com/{{ author.pinterest }}"><i class="fa fa-fw fa-pinterest" aria-hidden="true"></i> Pinterest</a></li>
+        <li><a href="https://www.pinterest.com/{{ author.pinterest }}"><i class="fa fa-fw fa-pinterest" aria-hidden="true"></i> Pinterest</a></li>
       {% endif %}
       {% if author.foursquare %}
-        <li><a href="http://foursquare.com/{{ author.foursquare }}"><i class="fa fa-fw fa-foursquare" aria-hidden="true"></i> Foursquare</a></li>
+        <li><a href="https://foursquare.com/{{ author.foursquare }}"><i class="fa fa-fw fa-foursquare" aria-hidden="true"></i> Foursquare</a></li>
       {% endif %}
       {% if author.steam %}
-        <li><a href="http://steamcommunity.com/id/{{ author.steam }}"><i class="fa fa-fw fa-steam-square" aria-hidden="true"></i> Steam</a></li>
+        <li><a href="https://steamcommunity.com/id/{{ author.steam }}"><i class="fa fa-fw fa-steam-square" aria-hidden="true"></i> Steam</a></li>
       {% endif %}
       {% if author.youtube %}
-        <li><a href="https://youtube.com/user/{{ author.youtube }}"><i class="fa fa-fw fa-youtube-square" aria-hidden="true"></i> Youtube</a></li>
+        <li><a href="https://www.youtube.com/user/{{ author.youtube }}"><i class="fa fa-fw fa-youtube-square" aria-hidden="true"></i> YouTube</a></li>
       {% endif %}
       {% if author.soundcloud %}
-        <li><a href="http://soundcloud.com/{{ author.soundcloud }}"><i class="fa fa-fw fa-soundcloud" aria-hidden="true"></i> Soundcloud</a></li>
+        <li><a href="https://soundcloud.com/{{ author.soundcloud }}"><i class="fa fa-fw fa-soundcloud" aria-hidden="true"></i> Soundcloud</a></li>
       {% endif %}
       {% if author.weibo %}
-        <li><a href="http://www.weibo.com/{{ author.weibo }}"><i class="fa fa-fw fa-weibo" aria-hidden="true"></i> Weibo</a></li>
+        <li><a href="https://www.weibo.com/{{ author.weibo }}"><i class="fa fa-fw fa-weibo" aria-hidden="true"></i> Weibo</a></li>
       {% endif %}
       {% if author.flickr %}
-        <li><a href="http://www.flickr.com/{{ author.flickr }}"><i class="fa fa-fw fa-flickr" aria-hidden="true"></i> Flickr</a></li>
+        <li><a href="https://www.flickr.com/{{ author.flickr }}"><i class="fa fa-fw fa-flickr" aria-hidden="true"></i> Flickr</a></li>
       {% endif %}
       {% if author.codepen %}
-        <li><a href="http://codepen.io/{{ author.codepen }}"><i class="fa fa-fw fa-codepen" aria-hidden="true"></i> CodePen</a></li>
+        <li><a href="https://codepen.io/{{ author.codepen }}"><i class="fa fa-fw fa-codepen" aria-hidden="true"></i> CodePen</a></li>
       {% endif %}
       {% if author.vine %}
         <li><a href="https://vine.co/u/{{ author.vine }}"><i class="fa fa-fw fa-vine" aria-hidden="true"></i> Vine</a></li>

_includes/category-list.html

@@ -2,14 +2,14 @@
 
 {% include base_path %}
 
-{% case site.categories.type %}
+{% case site.category_archive.type %}
   {% when "liquid" %}
     {% assign path_type = "#" %}
   {% when "jekyll-archives" %}
     {% assign path_type = nil %}
 {% endcase %}
 
-{% if site.categories.path %}
+{% if site.category_archive.path %}
   {% comment %}
     <!-- Sort alphabetically regardless of case e.g. a B c d E -->
     <!-- modified from http://www.codeofclimber.ru/2015/sorting-site-tags-in-jekyll/ -->
@@ -23,7 +23,7 @@
     {% for hash in category_hashes %}
       {% assign keyValue = hash | split: '#' %}
       {% capture category_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %}
-      <a href="{{ base_path }}{{ category_word | slugify | prepend: path_type | prepend: site.categories.path }}" class="page__taxonomy-item" rel="tag">{{ category_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
+      <a href="{{ base_path }}{{ category_word | slugify | prepend: path_type | prepend: site.category_archive.path }}" class="page__taxonomy-item" rel="tag">{{ category_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
     {% endfor %}
     </span>
   </p>

_includes/comments-providers/discourse.html

@@ -0,0 +1,14 @@
+{% if site.comments.discourse.server %}
+{% include base_path %}
+{% capture canonical %}{{ base_path }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
+<script type="text/javascript">
+    DiscourseEmbed = { discourseUrl: '//{{ site.comments.discourse.server }}/',
+                       discourseEmbedUrl: '{{ canonical }}' };
+   (function () {
+     var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+     d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+     (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+   })();
+</script>
+<noscript>Please enable JavaScript to view the comments powered by [Discourse](http://forum.beta-europe.org/c/beta/website).</a></noscript>
+{% endif %}

_includes/comments-providers/disqus.html

@@ -19,4 +19,4 @@
   	}());
   </script>
   <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-{% endif %}
+{% endif %}

_includes/comments-providers/google-plus.html

@@ -1,2 +1,2 @@
 <script async type="text/javascript" src="//apis.google.com/js/plusone.js?callback=gpcb"></script>
-<noscript>Please enable JavaScript to view the <a href="https://plus.google.com/">comments powered by Google+.</a></noscript>
+<noscript>Please enable JavaScript to view the <a href="https://plus.google.com/">comments powered by Google+.</a></noscript>

_includes/comments-providers/scripts.html

@@ -3,6 +3,8 @@
 {% case site.comments.provider %}
 {% when "disqus" %}
   {% include /comments-providers/disqus.html %}
+{% when "discourse" %}
+  {% include /comments-providers/discourse.html %}
 {% when "facebook" %}
   {% include /comments-providers/facebook.html %}
 {% when "google-plus" %}

_includes/feature_row

@@ -10,7 +10,7 @@
 
   {% for f in feature_row %}
 
-    {% if f.url contains "http" %}
+    {% if f.url contains "://" %}
       {% capture f_url %}{{ f.url }}{% endcapture %}
     {% else %}
       {% capture f_url %}{{ f.url | prepend: base_path }}{% endcapture %}
@@ -21,7 +21,7 @@
         {% if f.image_path %}
           <div class="archive__item-teaser">
             <img src=
-              {% if f.image_path contains "http" %}
+              {% if f.image_path contains "://" %}
                 "{{ f.image_path }}"
               {% else %}
                 "{{ f.image_path | prepend: "/images/" | prepend: base_path }}"

_includes/gallery

@@ -20,28 +20,29 @@
   {% for img in gallery %}
     {% if img.url %}
       <a href=
-        {% if img.url contains "http" %}
+        {% if img.url contains "://" %}
           "{{ img.url }}"
         {% else %}
           "{{ img.url | prepend: "/images/" | prepend: base_path }}"
         {% endif %}
+        {% if img.title %}title="{{ img.title }}"{% endif %}
       >
         <img src=
-          {% if img.image_path contains "http" %}
+          {% if img.image_path contains "://" %}
             "{{ img.image_path }}"
           {% else %}
             "{{ img.image_path | prepend: "/images/" | prepend: base_path }}"
           {% endif %}
-        alt="{% if img.alt %}{{ img.alt }}{% endif %}">
+          alt="{% if img.alt %}{{ img.alt }}{% endif %}">
       </a>
     {% else %}
       <img src=
-        {% if img.image_path contains "http" %}
+        {% if img.image_path contains "://" %}
           "{{ img.image_path }}"
         {% else %}
           "{{ img.image_path | prepend: "/images/" | prepend: base_path }}"
         {% endif %}
-      alt="{% if img.alt %}{{ img.alt }}{% endif %}">
+        alt="{% if img.alt %}{{ img.alt }}{% endif %}">
     {% endif %}
   {% endfor %}
   {% if include.caption %}

_includes/group-by-array

@@ -20,28 +20,28 @@
 {% assign __names =  __names | sort %}
 {% for name in __names | sort %}
 
-  <!-- If not equal to previous then it must be unique as sorted -->
+<!-- If not equal to previous then it must be unique as sorted -->
-  {% unless name == previous %}
+{% unless name == previous %}
 
-    <!-- Push to group_names -->
+<!-- Push to group_names -->
-    {% assign group_names = group_names | push: name %}
+{% assign group_names = group_names | push: name %}
-  {% endunless %}
+{% endunless %}
 
-  {% assign previous = name %}
+{% assign previous = name %}
 {% endfor %}
 
 
 <!-- group_items -->
 {% for name in group_names %}
 
-  <!-- Collect if contains -->
+<!-- Collect if contains -->
-  {% assign __item = __empty_array %}
+{% assign __item = __empty_array %}
-  {% for __element in include.collection %}
+{% for __element in include.collection %}
-    {% if __element[include.field] contains name %}
+{% if __element[include.field] contains name %}
-      {% assign __item = __item | push: __element %}
+{% assign __item = __item | push: __element %}
-    {% endif %}
+{% endif %}
-  {% endfor %}
-
-  <!-- Push to group_items -->
-  {% assign group_items = group_items | push: __item %}
 {% endfor %}
+
+<!-- Push to group_items -->
+{% assign group_items = group_items | push: __item %}
+{% endfor %}

_includes/nav_list

@@ -1,21 +1,42 @@
 {% include base_path %}
-{% assign navigation = site.data.navigation[page.sidebar.nav] %}
+{% assign navigation = site.data.navigation[include.nav] %}
 
 <nav class="nav__list">
   {% if page.sidebar.title %}<header><h4 class="nav__title" style="padding: 0;">{{ page.sidebar.title }}</h4></header>{% endif %}
   <ul>
     {% for nav in navigation %}
-      <li><span class="nav__sub-title">{{ nav.title }}</span>
+      <li>
+        {% if nav.url %}
+          {% comment %}internal/external URL check{% endcomment %}
+          {% if nav.url contains "://" %}
+            {% assign domain = "" %}
+          {% else %}
+            {% assign domain = base_path %}
+          {% endif %}
+
+          <a href="{{ domain }}{{ nav.url }}"><span class="nav__sub-title">{{ nav.title }}</span></a>
+        {% else %}
+          <span class="nav__sub-title">{{ nav.title }}</span>
+        {% endif %}
+
         {% if nav.children != null %}
         <ul>
           {% for child in nav.children %}
-          {% assign nav_url = child.path | prepend: "/" | prepend: page.sidebar.nav | prepend: "/" | append: "/" %}
+            {% comment %}internal/external URL check{% endcomment %}
-            {% if nav_url == page.url %}
+            {% if child.url contains "://" %}
+              {% assign domain = "" %}
+            {% else %}
+              {% assign domain = base_path %}
+            {% endif %}
+
+            {% comment %}set "active" class on current page{% endcomment %}
+            {% if child.url == page.url %}
               {% assign active = "active" %}
             {% else %}
               {% assign active = "" %}
             {% endif %}
-            <li><a href="{{ nav_url | prepend: base_path }}" class="{{ active }}">{{ child.title }}</a></li>
+
+            <li><a href="{{ domain }}{{ child.url }}" class="{{ active }}">{{ child.title }}</a></li>
           {% endfor %}
         </ul>
         {% endif %}

_includes/page__hero.html

@@ -1,25 +1,31 @@
 {% include base_path %}
 
-{% if page.header.image contains "http" %}
+{% if page.header.image contains "://" %}
   {% capture img_path %}{{ page.header.image }}{% endcapture %}
 {% else %}
   {% capture img_path %}{{ page.header.image | prepend: "/images/" | prepend: base_path }}{% endcapture %}
 {% endif %}
 
-{% if page.header.cta_url contains "http" %}
+{% if page.header.cta_url contains "://" %}
   {% capture cta_path %}{{ page.header.cta_url }}{% endcapture %}
 {% else %}
   {% capture cta_path %}{{ page.header.cta_url | prepend: base_path }}{% endcapture %}
 {% endif %}
 
-{% if page.header.overlay_image contains "http" %}
+{% if page.header.overlay_image contains "://" %}
   {% capture overlay_img_path %}{{ page.header.overlay_image }}{% endcapture %}
 {% elsif page.header.overlay_image %}
   {% capture overlay_img_path %}{{ page.header.overlay_image | prepend: "/images/" | prepend: base_path }}{% endcapture %}
 {% endif %}
 
+{% if page.header.overlay_filter contains "rgba" %}
+  {% capture overlay_filter %}{{ page.header.overlay_filter }}{% endcapture %}
+{% elsif page.header.overlay_filter %}
+  {% capture overlay_filter %}rgba(0, 0, 0, {{ page.header.overlay_filter }}){% endcapture %}
+{% endif %}
+
 <div class="page__hero{% if page.header.overlay_color or page.header.overlay_image %}--overlay{% endif %}"
-  style="{% if page.header.overlay_color %}background-color: {{ page.header.overlay_color | default: 'transparent' }};{% endif %} {% if overlay_img_path %}background-image: url('{{ overlay_img_path }}');{% endif %}"
+  style="{% if page.header.overlay_color %}background-color: {{ page.header.overlay_color | default: 'transparent' }};{% endif %} {% if overlay_img_path %}background-image: {% if overlay_filter %}linear-gradient({{ overlay_filter }}, {{ overlay_filter }}), {% endif %}url('{{ overlay_img_path }}');{% endif %}"
 >
   {% if page.header.overlay_color or page.header.overlay_image %}
     <div class="wrapper">

_includes/page__taxonomy.html

@@ -1,9 +1,9 @@
 {% include base_path %}
 
-{% if site.tags.type and page.tags[0] %}
+{% if site.tag_archive.type and page.tags[0] %}
   {% include tag-list.html %}
 {% endif %}
 
-{% if site.categories.type and page.categories[0] %}
+{% if site.category_archive.type and page.categories[0] %}
   {% include category-list.html %}
 {% endif %}

_includes/seo.html

@@ -25,7 +25,7 @@
   {% assign seo_description = seo_description | markdownify | strip_html | strip_newlines | escape_once %}
 {% endif %}
 
-{% assign seo_author = page.author | default: page.authors[0] | default: site.author %}
+{% assign seo_author = page.author | default: page.author[0] | default: site.author[0] %}
 {% if seo_author %}
   {% if seo_author.twitter %}
     {% assign seo_author_twitter = seo_author.twitter %}
@@ -60,7 +60,7 @@
 
   {% if page.header.image %}
     <meta name="twitter:card" content="summary_large_image">
-    <meta name="twitter:image" content="{% if page.header.image contains "http" %}{{ page.header.image }}{% else %}{{ page.header.image | prepend: "/images/" | prepend: base_path }}{% endif %}">
+    <meta name="twitter:image" content="{% if page.header.image contains "://" %}{{ page.header.image }}{% else %}{{ page.header.image | prepend: "/images/" | prepend: base_path }}{% endif %}">
   {% else %}
     <meta name="twitter:card" content="summary">
     {% if site.og_image %}
@@ -84,7 +84,7 @@
 {% endif %}
 
 {% if page.header.image %}
-  <meta property="og:image" content="{% if page.header.image contains "http" %}{{ page.header.image }}{% else %}{{ page.header.image | prepend: "/images/" | prepend: base_path }}{% endif %}">
+  <meta property="og:image" content="{% if page.header.image contains "://" %}{{ page.header.image }}{% else %}{{ page.header.image | prepend: "/images/" | prepend: base_path }}{% endif %}">
 {% endif %}
 
 {% if page.date %}
@@ -104,7 +104,7 @@
       "@context": "http://schema.org",
       "@type": "Organization",
       "url": {{ seo_url | jsonify }},
-      "logo": {{ site.og_image | prepend: "/" | prepend: seo_url | jsonify }}
+      "logo": {{ site.og_image | prepend: "/images/" | prepend: base_path | jsonify }}
     }
   </script>
 {% endif %}

_includes/sidebar.html

@@ -1,13 +1,13 @@
 {% include base_path %}
 
-{% if page.author_profile or page.sidebar %}
+{% if page.author_profile or layout.author_profile or page.sidebar %}
   <div class="sidebar sticky">
-  {% if page.author_profile %}{% include author-profile.html %}{% endif %}
+  {% if page.author_profile or layout.author_profile %}{% include author-profile.html %}{% endif %}
   {% if page.sidebar %}
     {% for s in page.sidebar %}
       {% if s.image %}
         <img src=
-        {% if s.image contains "http" %}
+        {% if s.image contains "://" %}
           "{{ s.image }}"
         {% else %}
           "{{ s.image | prepend: "/images/" | prepend: base_path }}"
@@ -18,7 +18,7 @@
       {% if s.text %}{{ s.text | markdownify }}{% endif %}
     {% endfor %}
     {% if page.sidebar.nav %}
-      {% include nav_list items=page.sidebar.nav %}
+      {% include nav_list nav=page.sidebar.nav %}
     {% endif %}
   {% endif %}
   </div>

_includes/tag-list.html

@@ -1,13 +1,13 @@
 {% include base_path %}
 
-{% case site.tags.type %}
+{% case site.tag_archive.type %}
   {% when "liquid" %}
     {% assign path_type = "#" %}
   {% when "jekyll-archives" %}
     {% assign path_type = nil %}
 {% endcase %}
 
-{% if site.tags.path %}
+{% if site.tag_archive.path %}
   {% comment %}
     <!-- Sort alphabetically regardless of case e.g. a B c d E -->
     <!-- modified from http://www.codeofclimber.ru/2015/sorting-site-tags-in-jekyll/ -->
@@ -21,7 +21,7 @@
     {% for hash in tag_hashes %}
       {% assign keyValue = hash | split: '#' %}
       {% capture tag_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %}
-      <a href="{{ base_path }}{{ tag_word | slugify | prepend: path_type | prepend: site.tags.path }}" class="page__taxonomy-item" rel="tag">{{ tag_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
+      <a href="{{ base_path }}{{ tag_word | slugify | prepend: path_type | prepend: site.tag_archive.path }}" class="page__taxonomy-item" rel="tag">{{ tag_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
     {% endfor %}
     </span>
   </p>

_layouts/single.html

@@ -26,7 +26,7 @@ layout: default
     <div class="page__inner-wrap">
       {% unless page.header.overlay_color or page.header.overlay_image %}
         <header>
-          <h1 class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>
+          {% if page.title %}<h1 class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>{% endif %}
           {% if page.read_time %}
             <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> {% include read-time.html %}</p>
           {% endif %}

assets/_scss/_footer.scss

@@ -6,16 +6,11 @@
   @include container;
   @include clearfix;
   margin-top: 3em;
-  padding: 0 2em 3em;
+  padding: 0 1em 3em;
   color: mix(#fff, $gray, 25%);
   animation: intro 0.3s both;
   animation-delay: 0.45s;
 
-  @include breakpoint($large) {
-    padding-left: 1em;
-    padding-right: 1em;
-  }
-
   @include breakpoint($x-large) {
     max-width: $x-large;
   }

assets/_scss/_masthead.scss

@@ -12,16 +12,11 @@
   &__inner-wrap {
     @include container;
     @include clearfix;
-    padding: 1em 2em 1em;
+    padding: 1em 1em 1em;
     font-family: $sans-serif-narrow;
     font-weight: 700;
     text-transform: uppercase;
 
-    @include breakpoint($large) {
-      padding-left: 1em;
-      padding-right: 1em;
-    }
-
     @include breakpoint($x-large) {
       max-width: $x-large;
     }

assets/_scss/_navigation.scss

@@ -227,17 +227,17 @@
       &:before {
         content: "";
         position: absolute;
+        left: 0;
         bottom: 0;
         height: 4px;
         background: mix(#fff, $primary-color, 50%);
-        width: 0;
+        width: 100%;
         transition: $global-transition;
+        transform: scaleX(0); // hide
       }
 
-      &:hover {
+      &:hover:before {
-        &:before {
+        transform: scaleX(1); // reveal
-          width: 100%;
-        }
       }
     }
   }

assets/_scss/_page.scss

@@ -6,16 +6,11 @@
   @include container;
   @include clearfix;
   margin-top: 2em;
-  padding-left: 2em;
+  padding-left: 1em;
-  padding-right: 2em;
+  padding-right: 1em;
   animation: intro 0.3s both;
   animation-delay: 0.35s;
 
-  @include breakpoint($large) {
-    padding-left: 1em;
-    padding-right: 1em;
-  }
-
   @include breakpoint($x-large) {
     max-width: $x-large;
   }
@@ -295,10 +290,6 @@
   float: left;
 
   @include breakpoint($large) {
-    @include pre(2 of 12);
-  }
-
-  @include breakpoint($x-large) {
     @include pre(2.5 of 12);
   }
 

assets/_scss/_sidebar.scss

@@ -127,7 +127,7 @@
 .author__urls-wrapper {
   position: relative;
   display: table-cell;
-  vertical-align: top;
+  vertical-align: middle;
   font-family: $sans-serif;
   z-index: 10;
   position: relative;
@@ -142,7 +142,10 @@
   @include breakpoint($large) {
     display: block;
   }
-  .btn {
+
+  button {
+    margin-bottom: 0;
+
     @include breakpoint($large) {
       display: none;
     }

assets/_scss/_utilities.scss

@@ -184,6 +184,7 @@ body:hover .visually-hidden button {
 .social-icons {
   .fa {
     color: #000;
+    display: initial;
   }
 
   .fa-behance,
@@ -200,11 +201,6 @@ body:hover .visually-hidden button {
     color: $facebook-color;
   }
 
-  .fa-twitter,
-  .fa-twitter-square {
-    color: $twitter-color;
-  }
-
   .fa-flickr {
     color: $flickr-color;
   }

index.html

@@ -5,10 +5,10 @@ author_profile: true
 
 {% include base_path %}
 
-<h3 class="archive__subtitle">Recent Posts</h3>
+<h3 class="archive__subtitle">{{ site.data.ui-text[site.locale].recent_posts }}</h3>
 
 {% for post in paginator.posts %}
   {% include archive-single.html %}
 {% endfor %}
 
-{% include paginator.html %}
+{% include paginator.html %}

package.json

@@ -37,6 +37,6 @@
     "watch:all": "npm-run-all --parallel watch:css watch:js",
     "build:css": "npm run scss && npm run autoprefixer",
     "build:js": "npm run uglify",
-    "build:all": "npm run build:css && build:js"
+    "build:all": "npm run build:css && npm run build:js"
   }
 }