Merge branch 'release/3.2.9'

- Issue #356

.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,90 @@
+## [3.2.9](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.9)
+
+### Enhancements
+
+- Add support for [header overlay images](https://mmistakes.github.io/minimal-mistakes/docs/layouts/#header-overlay) for Open Graph images. [#358](https://github.com/mmistakes/minimal-mistakes/pull/358)
+
+### Bug Fixes
+
+- Fix `Person` typo Schema.org type [#358](https://github.com/mmistakes/minimal-mistakes/pull/358)
+
+### Maintenance
+
+- Update `github-pages` gem and dependencies.
+- Remove `minutes_read` to avoid awkward reading time wording [#356](https://github.com/mmistakes/minimal-mistakes/issues/356)
+
+## [3.2.8](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.8)
+
+### Bug Fixes
+
+- Remove `cursor: pointer` that appears on white-space surrounding author side list items and links. [#354](https://github.com/mmistakes/minimal-mistakes/pull/354)
+
+### Maintenance
+
+- Add contributing information to `README.md`. [#357](https://github.com/mmistakes/minimal-mistakes/issues/357)
+
+## [3.2.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.7)
+
+### Enhancements
+
+- Add French localized UI text. [#346](https://github.com/mmistakes/minimal-mistakes/pull/346)
+
+### Bug Fixes
+
+- Fix branch logic for Yandex and Alexa in `seo.html`. [#348](https://github.com/mmistakes/minimal-mistakes/pull/348)
+
+## [3.2.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.6)
+
+### Bug Fixes
+
+- Fix error `Liquid Exception: divided by 0 in _includes/archive-single.html, included in _layouts/single.html` caused by null `words_per_minute` in `_config.yml`. [#345](https://github.com/mmistakes/minimal-mistakes/pull/345)
+
+## [3.2.5](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.5)
+
+### Bug Fixes
+
+- Fix link color in hero overlay to be white.
+- Remove underlines from archive item titles.
+
+## [3.2.4](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.4)
+
+### Enhancements
+
+- Improve text alignment of masthead, hero overlay, page footer to be flush left and remove awkward white-space gaps. [#342](https://github.com/mmistakes/minimal-mistakes/issues/342)
+- Add Spanish localized UI text. [#338](https://github.com/mmistakes/minimal-mistakes/pull/338)
+
+### Bug Fixes
+
+- Fix alignment of icons in author sidebar [#341](https://github.com/mmistakes/minimal-mistakes/issues/341)
+
+### Maintenance
+
+- Add background color to page footer to set it apart from main content. [#342](https://github.com/mmistakes/minimal-mistakes/issues/342)
+- Add terms and privacy policy to theme's demo site. [#343](https://github.com/mmistakes/minimal-mistakes/issues/343)
+- Update screenshots found in theme documentation.
+
+## [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
@@ -86,7 +173,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

@@ -21,18 +21,18 @@ GEM
     ffi (1.9.10)
     ffi (1.9.10-x64-mingw32)
     gemoji (2.1.0)
-    github-pages (80)
+    github-pages (82)
       github-pages-health-check (= 1.1.0)
       jekyll (= 3.1.6)
       jekyll-coffeescript (= 1.0.1)
       jekyll-feed (= 0.5.1)
       jekyll-gist (= 1.4.0)
-      jekyll-github-metadata (= 1.11.1)
+      jekyll-github-metadata (= 2.0.0)
       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.4.0)
+      jekyll-seo-tag (= 2.0.0)
       jekyll-sitemap (= 0.10.0)
       jemoji (= 0.6.2)
       kramdown (= 1.10.0)
@@ -65,7 +65,8 @@ GEM
     jekyll-feed (0.5.1)
     jekyll-gist (1.4.0)
       octokit (~> 4.2)
-    jekyll-github-metadata (1.11.1)
+    jekyll-github-metadata (2.0.0)
+      jekyll (~> 3.1)
       octokit (~> 4.0)
     jekyll-mentions (1.1.2)
       html-pipeline (~> 2.3)
@@ -75,8 +76,8 @@ GEM
       jekyll (>= 2.0)
     jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
-    jekyll-seo-tag (1.4.0)
-      jekyll (~> 3.0)
+    jekyll-seo-tag (2.0.0)
+      jekyll (~> 3.1)
     jekyll-sitemap (0.10.0)
     jekyll-watch (1.4.0)
       listen (~> 3.0, < 3.1)
@@ -91,16 +92,19 @@ GEM
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9.7)
     mercenary (0.3.6)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     minitest (5.9.0)
     multipart-post (2.0.0)
     net-dns (0.8.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    nokogiri (1.6.7.2-x64-mingw32)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    nokogiri (1.6.8-x64-mingw32)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
+    pkg-config (1.1.7)
     public_suffix (1.5.3)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
@@ -111,12 +115,13 @@ GEM
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
-    terminal-table (1.5.2)
+    terminal-table (1.6.0)
     thread_safe (0.3.5)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    wdm (0.1.1)
 
 PLATFORMS
   ruby
@@ -124,6 +129,7 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages
+  wdm (~> 0.1.0)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

README.md

@@ -5,11 +5,11 @@ Minimal Mistakes is a flexible two-column Jekyll theme. Perfect for hosting your
 [![Minimal Mistakes live preview][2]][1]
 
 [1]: https://mmistakes.github.io/minimal-mistakes/
-[2]: https://cloud.githubusercontent.com/assets/1376749/14562643/d83b96c0-02eb-11e6-98d6-473fbfd3bff6.jpg (live preview)
+[2]: images/mm-browser-mockups.png (live preview)
 
 The theme includes responsive layouts (`single`, `archive`, and `splash` pages) that look great on mobile and desktop browsers.
 
-![layout examples](https://cloud.githubusercontent.com/assets/1376749/14541626/dac474f4-0258-11e6-83f6-40e752028222.png)
+![layout examples](images/mm-layout-examples.png)
 
 ## [Installation and Setup](https://mmistakes.github.io/minimal-mistakes/docs/quick-start-guide/) / [Preview the Theme](https://mmistakes.github.io/minimal-mistakes/)
 
@@ -19,8 +19,8 @@ The theme includes responsive layouts (`single`, `archive`, and `splash` 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.
-- Optional comments ([Disqus](https://disqus.com/), [Facebook](https://developers.facebook.com/docs/plugins/comments), Google+, and custom)
-- Optional analytics ([Google Analytics](https://www.google.com/analytics/) and custom)
+- Optional comments ([Disqus](https://disqus.com/), [Facebook](https://developers.facebook.com/docs/plugins/comments), Google+, [Discourse](https://www.discourse.org/), and custom).
+- Optional analytics ([Google Analytics](https://www.google.com/analytics/) and custom).
 
 #### Demo Pages
 
@@ -47,15 +47,29 @@ For even more demo pages check the [posts archive][year-archive].
 
 ---
 
-### Credits
+## Contributing
 
-#### Icons + Demo Images:
+Having trouble working with the theme? Found a typo in the documentation? Interested in adding a feature or [fixing a bug](https://github.com/mmistakes/minimal-mistakes/issues)? Then by all means [submit an issue](https://github.com/mmistakes/minimal-mistakes/issues/new) or [pull request](https://help.github.com/articles/using-pull-requests/). If this is your first pull request, it may be helpful to read up on the [GitHub Flow](https://guides.github.com/introduction/flow/) first.
+
+Minimal Mistakes has been designed as a base for you to customize and fit your site's unique needs. Please keep this in mind when requesting features and/or submitting pull requests. If it's not something that most people will use, I probably won't consider it. When in doubt ask. 
+
+This goes for author sidebar links and "share button" additions -- I have no intention of merging in every possibly option, the essentials are there to get you started :smile:.
+
+### Pull Requests
+
+To help me out try to avoid creating pull requests on `master` and instead branch off of `develop`. It's much easier for me to test, merge, and roll them into new releases this way.
+
+---
+
+## Credits
+
+### Icons + Demo Images:
 
 - [The Noun Project](https://thenounproject.com) -- Garrett Knoll, Arthur Shlain, and [tracy tam](https://thenounproject.com/tracytam)
 - [Font Awesome](http://fortawesome.github.io/Font-Awesome/)
 - [Unsplash](https://unsplash.com/)
 
-#### Other:
+### Other:
 
 - [Jekyll](http://jekyllrb.com/)
 - [jQuery](http://jquery.com/)
@@ -69,6 +83,8 @@ For even more demo pages check the [posts archive][year-archive].
 
 ---
 
+## License
+
 The MIT License (MIT)
 
 Copyright (c) 2016 Michael Rose

_config.yml

@@ -18,9 +18,11 @@ teaser                   : # filename of teaser fallback teaser image placed in
 # breadcrumbs            : false # true, false (default)
 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                :

_data/ui-text.yml

@@ -12,7 +12,6 @@ en: &DEFAULT_EN
   ext_link_label        : "Direct Link"
   less_than             : "less than"
   minute_read           : "minute read"
-  minutes_read          : "minutes read"
   share_on_label        : "Share on"
   meta_label            :
   tags_label            : "Tags:"
@@ -27,10 +26,77 @@ en: &DEFAULT_EN
   website_label         : "Website"
   email_label           : "Email"
   recent_posts          : "Recent Posts"
+  undefined_wpm         : "Undefined parameter words_per_minute at _config.yml"
 en-US:
   <<: *DEFAULT_EN
 en-UK:
   <<: *DEFAULT_EN
 
+# Spanish
+# --------------
+es: &DEFAULT_ES
+  page                  : "Página"
+  pagination_previous   : "Anterior"
+  pagination_next       : "Siguiente"
+  breadcrumb_home_label : "Inicio"
+  breadcrumb_separator  : "/"
+  toc_label             : "Contenidos"
+  ext_link_label        : "Enlace"
+  less_than             : "menos de"
+  minute_read           : "minuto de lectura"
+  share_on_label        : "Compartir"
+  meta_label            :
+  tags_label            : "Etiquetas:"
+  categories_label      : "Categorías:"
+  date_label            : "Actualizado:"
+  comments_label        : "Comentar"
+  more_label            : "Ver más"
+  related_label         : "Podrías ver también"
+  follow_label          : "Seguir:"
+  feed_label            : "Feed"
+  powered_by            : "Powered by"
+  website_label         : "Sitio web"
+  email_label           : "Email"
+  recent_posts          : "Entradas recientes"
+  undefined_wpm         : "Parametro words_per_minute (Palabras por minuto) no definido en _config.yml"
+es-ES:
+  <<: *DEFAULT_ES
+es-CO:
+  <<: *DEFAULT_ES
+
+# French
+# -----------------
+fr: &DEFAULT_FR
+  page                  : "Page"
+  pagination_previous   : "Précédent"
+  pagination_next       : "Suivant"
+  breadcrumb_home_label : "Accueil"
+  breadcrumb_separator  : "/"
+  toc_label             : "Sur cette page"
+  ext_link_label        : "Lien direct"
+  less_than             : "plus petit que"
+  minute_read           : "minute de lecture"
+  share_on_label        : "Partager sur"
+  meta_label            :
+  tags_label            : "Tags :"
+  categories_label      : "Catégories :"
+  date_label            : "Mis à jour :"
+  comments_label        : "Laisser un commentaire"
+  more_label            : "Lire plus"
+  related_label         : "Vous pourriez aimer"
+  follow_label          : "Suivez moi"
+  feed_label            : "Flux"
+  powered_by            : "Propulsé par"
+  website_label         : "Site"
+  email_label           : "Email"
+  recent_posts          : "Posts récents"
+  undefined_wpm         : "Le paramètre words_per_minute n'est pas défini dans _config.yml"
+fr-FR:
+  <<: *DEFAULT_FR
+fr-BE:
+  <<: *DEFAULT_FR
+fr-CH:
+  <<: *DEFAULT_FR
+
 # 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 }}">

_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/nav_list

@@ -8,7 +8,7 @@
       <li>
         {% if nav.url %}
           {% comment %}internal/external URL check{% endcomment %}
-          {% if nav.url contains "http" %}
+          {% if nav.url contains "://" %}
             {% assign domain = "" %}
           {% else %}
             {% assign domain = base_path %}
@@ -23,7 +23,7 @@
         <ul>
           {% for child in nav.children %}
             {% comment %}internal/external URL check{% endcomment %}
-            {% if child.url contains "http" %}
+            {% if child.url contains "://" %}
               {% assign domain = "" %}
             {% else %}
               {% assign domain = base_path %}
@@ -43,6 +43,4 @@
       </li>
     {% endfor %}
   </ul>
-</nav>
-
-
+</nav>

_includes/page__hero.html

@@ -1,18 +1,18 @@
 {% 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 %}
@@ -52,4 +52,4 @@
   {% if page.header.caption %}
     <span class="page__hero-caption">{{ page.header.caption | markdownify | remove: "<p>" | remove: "</p>" }}</span>
   {% endif %}
-</div>
+</div>

_includes/read-time.html

@@ -4,10 +4,14 @@
   {% assign words = page.content | strip_html | number_of_words %}
 {% endif %}
 
-{% if words < 180 %}
-  {{ site.data.ui-text[site.locale].less_than }} 1 {{ site.data.ui-text[site.locale].minute_read }}
-{% elsif words < 360 %}
-  1 {{ site.data.ui-text[site.locale].minute_read }}
+{% if site.words_per_minute %}
+  {% if words < 180 %}
+	  {{ site.data.ui-text[site.locale].less_than }} 1 {{ site.data.ui-text[site.locale].minute_read }}
+	{% elsif words < 360 %}
+	  1 {{ site.data.ui-text[site.locale].minute_read }}
+	{% else %}
+	  {{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minute_read }}
+	{% endif %}
 {% else %}
-  {{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minutes_read }}
+  {{ site.data.ui-text[site.locale].undefined_wpm }}
 {% endif %}

_includes/seo.html

@@ -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,9 @@
 {% 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 %}">
+{% elsif page.header.overlay_image %}
+  <meta property="og:image" content="{% if page.header.overlay_image contains "://" %}{{ page.header.overlay_image }}{% else %}{{ page.header.overlay_image | prepend: "/images/" | prepend: base_path }}{% endif %}">
 {% endif %}
 
 {% if page.date %}
@@ -113,7 +115,7 @@
   <script type="application/ld+json">
     {
       "@context" : "http://schema.org",
-      "@type" : "{% if site.social.type %}{{ site.social.type }}{% else %}person{% endif %}",
+      "@type" : "{% if site.social.type %}{{ site.social.type }}{% else %}Person{% endif %}",
       "name" : "{{ site.social.name | default: site.name }}",
       "url" : {{ seo_url | jsonify }},
       "sameAs" : {{ site.social.links | jsonify }}
@@ -127,10 +129,10 @@
 {% if site.bing_site_verification %}
   <meta name="msvalidate.01" content="{{ site.bing_site_verification }}">
 {% endif %}
-{% if site.owner.alexa.verify %}
+{% if site.alexa_site_verification %}
   <meta name="alexaVerifyID" content="{{ site.alexa_site_verification }}">
 {% endif %}
-{% if site.owner.yandex.verify %}
+{% if site.yandex_site_verification %}
   <meta name="yandex-verification" content="{{ site.yandex_site_verification }}">
 {% endif %}
-<!-- end SEO -->
+<!-- end SEO -->

_includes/sidebar.html

@@ -7,7 +7,7 @@
     {% 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 }}"

_layouts/default.html

@@ -20,12 +20,12 @@ layout: compress
 
     <div class="page__footer">
       <footer>
+        {% include footer/custom.html %}
         {% include footer.html %}
       </footer>
     </div>
 
     {% include scripts.html %}
-    {% include footer/custom.html %}
 
   </body>
 </html>

assets/_scss/_archive.scss

@@ -35,7 +35,15 @@
 .archive__item-title {
   margin-bottom: 0.25em;
   font-family: $sans-serif-narrow;
-  font-size: $type-size-5;
+}
+
+// remove border
+.page__content {
+
+  .archive__item-title {
+    margin-top: 1em;
+    border-bottom: none;
+  }
 }
 
 .archive__item-excerpt {
@@ -149,7 +157,6 @@ a:hover {
 
   @include breakpoint($small) {
     margin-bottom: 0;
-    text-align: center;
     @include gallery(4 of 12);
 
     .feature__item-teaser {
@@ -158,14 +165,8 @@ a:hover {
     }
   }
 
-  .archive__item-body {
-    padding-left: 0.5em;
-    padding-right: 0.5em;
-  }
-
   &--left {
     @include full();
-    // margin-bottom: 2em;
     font-size: 1.25rem;
 
     .archive__item-teaser {
@@ -187,7 +188,6 @@ a:hover {
 
   &--right {
     @include full();
-    // margin-bottom: 2em;
     font-size: 1.25rem;
 
     .archive__item-teaser {
@@ -211,7 +211,6 @@ a:hover {
 
   &--center {
     @include full();
-    // margin-bottom: 2em;
     font-size: 1.25rem;
 
     .archive__item-teaser {

assets/_scss/_footer.scss

@@ -3,16 +3,24 @@
    ========================================================================== */
 
 .page__footer {
-  @include container;
+  @include full();
   @include clearfix;
   margin-top: 3em;
-  padding: 0 1em 3em;
   color: mix(#fff, $gray, 25%);
   animation: intro 0.3s both;
   animation-delay: 0.45s;
+  background-color: $lighter-gray;
+  border-top: 1px solid $light-gray;
 
-  @include breakpoint($x-large) {
-    max-width: $x-large;
+  footer {
+    @include container;
+    @include clearfix;
+    margin-top: 2em;
+    padding: 0 1em 2em;
+
+    @include breakpoint($x-large) {
+      max-width: $x-large;
+    }
   }
 
   a {
@@ -23,21 +31,18 @@
       text-decoration: underline;
     }
   }
+
+  .fa {
+    color: mix(#fff, $gray, 25%);
+  }
 }
 
 .page__footer-copyright {
   font-family: $global-font-family;
   font-size: $type-size-7;
-
-  @include breakpoint($large) {
-    @include prefix(2.5 of 12);
-  }
 }
 
 .page__footer-follow {
-  @include breakpoint($large) {
-    @include prefix(2.5 of 12);
-  }
 
   ul {
     margin: 0;

assets/_scss/_masthead.scss

@@ -14,8 +14,6 @@
     @include clearfix;
     padding: 1em 1em 1em;
     font-family: $sans-serif-narrow;
-    font-weight: 700;
-    text-transform: uppercase;
 
     @include breakpoint($x-large) {
       max-width: $x-large;
@@ -32,9 +30,6 @@
 }
 
 .masthead__menu {
-  @include breakpoint($large) {
-    @include prefix(2.5 of 12);
-  }
 
   ul {
     margin: 0;
@@ -47,10 +42,10 @@
 .masthead__menu-item {
   display: block;
   list-style-type: none;
-  font-size: $type-size-6;
   white-space: nowrap;
 
   &--lg {
-    font-size: $type-size-5;
+    padding-right: 2em;
+    font-weight: 700;
   }
 }

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 {
-        &:before {
-          width: 100%;
-        }
+      &:hover:before {
+        transform: scaleX(1); // reveal
       }
     }
   }

assets/_scss/_page.scss

@@ -49,6 +49,12 @@
 }
 
 .page__content {
+
+  h2 {
+    padding-bottom: 0.5em;
+    border-bottom: 1px solid $border-color;
+  }
+
   p, li, dl {
     font-size: 1em;
   }
@@ -113,16 +119,23 @@
     margin-bottom: 2em;
     padding: 3em 0;
     @include clearfix;
-    text-align: center;
     background-size: cover;
     background-repeat: no-repeat;
     background-position: center;
     animation: intro 0.3s both;
     animation-delay: 0.25s;
 
+    a {
+      color: #fff;
+    }
+
     .wrapper {
-      padding-left: 2em;
-      padding-right: 2em;
+      padding-left: 1em;
+      padding-right: 1em;
+
+      @include breakpoint($x-large) {
+        max-width: $x-large;
+      }
     }
 
     .page__title,
@@ -133,6 +146,10 @@
       text-shadow: 1px 1px 4px rgba(#000, 0.5);
     }
 
+    .page__lead {
+      max-width: $medium;
+    }
+
     .page__title {
       font-size: $type-size-2;
 

assets/_scss/_sidebar.scss

@@ -164,6 +164,7 @@
   background: #fff;
   z-index: -1;
   box-shadow: 0 0 10px rgba(#000, 0.25);
+  cursor: default;
 
   @include breakpoint($large) {
     display: block;

assets/_scss/_utilities.scss

@@ -184,7 +184,6 @@ body:hover .visually-hidden button {
 .social-icons {
   .fa {
     color: #000;
-    display: initial;
   }
 
   .fa-behance,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "minimal-mistakes",
-  "version": "2.1.0",
+  "version": "3.2.9",
   "description": "Minimal Mistakes Jekyll theme npm build scripts",
   "repository": {
     "type": "git",