Merge branch 'release/3.2.7'

- Remove extra white-space
- Close #317

CHANGELOG.md

@@ -1,3 +1,26 @@
+## [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

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
 

_data/ui-text.yml

@@ -27,6 +27,7 @@ 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:
@@ -59,10 +60,46 @@ es: &DEFAULT_ES
   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"
+  minutes_read          : "minutes 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/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].minutes_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

@@ -127,10 +127,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 -->

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 {

assets/_scss/_page.scss

@@ -125,6 +125,10 @@
     animation: intro 0.3s both;
     animation-delay: 0.25s;
 
+    a {
+      color: #fff;
+    }
+
     .wrapper {
       padding-left: 1em;
       padding-right: 1em;

package.json

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