Merge branch 'release/4.0.10'

- `comment_success_msg` : Just corrected a missing `m` in *commentaire*
- `related_label` : Added `aussi` (*as well*) in the end of the sentence to make it more "natural" French
-`less_than` : `plus petit que` wasn't right, in this precise context, this form is more about the mathematical character `<`. `moins de` is one of the exact use in this particular case (talking about duration) --- *Less than one minute* == `Moins de 1 minute`
- `follow_label` : Using `Contact` in place of `Suivez moi` make it less personal, and so, better suited for most cases (`Suivez moi` is more like `Follow me`)

CHANGELOG.md

@@ -1,3 +1,30 @@
+## [4.0.10](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.10)
+
+### Bug Fixes
+
+- Add Staticman default `path`. [#683](https://github.com/mmistakes/minimal-mistakes/issues/683)
+
+### Maintenance
+
+- Slight correction/improvements to French UI text. [#685](https://github.com/mmistakes/minimal-mistakes/pull/685)
+
+## [4.0.9](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.9)
+
+### Bug Fixes
+
+- Fix overlapping sidebar navigation lists due to `max-height: 100vh`. [#668](https://github.com/mmistakes/minimal-mistakes/issues/668)
+
+## [4.0.8](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.8)
+
+### Bug Fixes
+
+- Set default value for `words_per_minute`. [#657](https://github.com/mmistakes/minimal-mistakes/issues/657)
+- Adjust sidebar navigation list CSS so it collapses at the correct width.
+
+### Maintenance
+
+- Add Google AdSense banner to `/docs/_layouts/default.html` for demo site.
+
 ## [4.0.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.7)
 
 ### Enhancements

_config.yml

@@ -35,7 +35,7 @@ staticman:
   filename               : comment-{@timestamp}
   format                 : "yml"
   moderation             : true
-  path                   : "docs/_data/comments/{options.slug}"
+  path                   : "docs/_data/comments/{options.slug}" # "/_data/comments/{options.slug}" (default)
   requiredFields         : ['name', 'email', 'message']
   transforms:
     email                : "md5"

_data/ui-text.yml

@@ -105,7 +105,7 @@ fr: &DEFAULT_FR
   menu_label                 :
   toc_label                  : "Sur cette page"
   ext_link_label             : "Lien direct"
-  less_than                  : "plus petit que"
+  less_than                  : "moins de"
   minute_read                : "minute de lecture"
   share_on_label             : "Partager sur"
   meta_label                 :
@@ -115,8 +115,8 @@ fr: &DEFAULT_FR
   comments_label             : "Laisser un commentaire"
   comments_title             :
   more_label                 : "Lire plus"
-  related_label              : "Vous pourriez aimer"
+  related_label              : "Vous pourriez aimer aussi"
-  follow_label               : "Suivez moi"
+  follow_label               : "Contact"
   feed_label                 : "Flux"
   powered_by                 : "Propulsé par"
   website_label              : "Site"
@@ -132,7 +132,7 @@ fr: &DEFAULT_FR
   comment_form_website_label : "Site web (optionnel)"
   comment_btn_submit         : "Envoyer"
   comment_btn_submitted      : "Envoyé"
-  comment_success_msg        : "Merci pour votre comentaire, il sera visible sur le site une fois approuvé."
+  comment_success_msg        : "Merci pour votre commentaire, il sera visible sur le site une fois approuvé."
   comment_error_msg          : "Désolé, une erreur est survenue lors de la soumission. Vérifiez que les champs obligatoires ont été remplis et réessayez."
   loading_label              : "Chargement..."
 fr-FR:

_includes/read-time.html

@@ -1,17 +1,15 @@
+{% assign words_per_minute = site.words_per_minute | default: 200 %}
+
 {% if post.read_time %}
   {% assign words = post.content | strip_html | number_of_words %}
 {% elsif page.read_time %}
   {% assign words = page.content | strip_html | number_of_words %}
 {% endif %}
 
-{% if site.words_per_minute %}
+{% if words < 180 %}
-  {% if words < 180 %}
+  {{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
-	  {{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
+{% elsif words < 360 %}
-	{% elsif words < 360 %}
+  1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
-	  1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
-	{% else %}
-	  {{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
-	{% endif %}
 {% else %}
-  {{ site.data.ui-text[site.locale].undefined_wpm | "Undefined parameter words_per_minute at _config.yml" }}
+  {{ words | divided_by:words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
 {% endif %}

_sass/_navigation.scss

@@ -321,7 +321,7 @@
     display: none;
   }
 
-  @include breakpoint(max-width $large) {
+  @include breakpoint(max-width ($large - 1px)) {
 
     label {
       position: relative;
@@ -428,10 +428,10 @@
     }
   }
 
-  @include breakpoint(max-width $large) {
+  @include breakpoint(max-width ($large - 1px)) {
     position: relative;
     max-height: 0;
-    opacity: 0;
+    opacity: 0%;
     overflow: hidden;
     z-index: 10;
     -webkit-transition: 0.3s ease-in-out;
@@ -442,11 +442,11 @@
   }
 }
 
-@include breakpoint(max-width $large) {
+@include breakpoint(max-width ($large - 1px)) {
   .nav__list input:checked ~ .nav__items {
     -webkit-transition: 0.5s ease-in-out;
     transition: 0.5s ease-in-out;
-    max-height: 100vh;
+    max-height: 9999px; // exaggerate max-height to accommodate tall lists
     overflow: visible;
     opacity: 1;
     margin-top: 1em;

docs/_data/comments/gemified-theme-beta/comment-1479508047505.yml

@@ -0,0 +1,6 @@
+message: wonderful theme!
+name: burner
+email: 7327e2b38683d37634ada1dfa1d9f6e7
+url: ''
+hidden: ''
+date: '2016-11-18T22:27:26.851Z'

docs/_data/comments/gemified-theme-beta/comment-1480591890264.yml

@@ -0,0 +1,7 @@
+_id: b3f80ef0-b7b9-11e6-9b81-0bc3350a75b6
+message: Awesome....
+name: Joko
+email: e173d909aa244a3fbf81908da947ff94
+url: ''
+hidden: ''
+date: '2016-12-01T11:31:30.231Z'

docs/_data/ui-text.yml

@@ -105,7 +105,7 @@ fr: &DEFAULT_FR
   menu_label                 :
   toc_label                  : "Sur cette page"
   ext_link_label             : "Lien direct"
-  less_than                  : "plus petit que"
+  less_than                  : "moins de"
   minute_read                : "minute de lecture"
   share_on_label             : "Partager sur"
   meta_label                 :
@@ -115,8 +115,8 @@ fr: &DEFAULT_FR
   comments_label             : "Laisser un commentaire"
   comments_title             :
   more_label                 : "Lire plus"
-  related_label              : "Vous pourriez aimer"
+  related_label              : "Vous pourriez aimer aussi"
-  follow_label               : "Suivez moi"
+  follow_label               : "Contact"
   feed_label                 : "Flux"
   powered_by                 : "Propulsé par"
   website_label              : "Site"
@@ -132,7 +132,7 @@ fr: &DEFAULT_FR
   comment_form_website_label : "Site web (optionnel)"
   comment_btn_submit         : "Envoyer"
   comment_btn_submitted      : "Envoyé"
-  comment_success_msg        : "Merci pour votre comentaire, il sera visible sur le site une fois approuvé."
+  comment_success_msg        : "Merci pour votre commentaire, il sera visible sur le site une fois approuvé."
   comment_error_msg          : "Désolé, une erreur est survenue lors de la soumission. Vérifiez que les champs obligatoires ont été remplis et réessayez."
   loading_label              : "Chargement..."
 fr-FR:

docs/_docs/05-configuration.md

@@ -2,7 +2,7 @@
 title: "Configuration"
 permalink: /docs/configuration/
 excerpt: "Settings for configuring and customizing the theme."
-modified: 2016-11-03T10:42:01-04:00
+modified: 2016-11-29T08:44:22-05:00
 ---
 
 Settings that affect your entire site can be changed in [Jekyll's configuration file](https://jekyllrb.com/docs/configuration/): `_config.yml`, found in the root of your project. If you don't have this file you'll need to copy or create one using the theme's [default `_config.yml`](https://github.com/mmistakes/minimal-mistakes/blob/master/_config.yml) as a base.
@@ -206,7 +206,6 @@ comments:
     server               : # meta.discourse.org
 ```
   
-
 ##### Facebook Comments
 
 To enable Facebook Comments choose how many comments you'd like visible per post and the color scheme of the widget.
@@ -231,7 +230,7 @@ Transform user comments into `_data` files that live inside of your GitHub repos
 
 ###### Configure Staticman
 
-Default settings have been provided in `_config.yml`. The important ones to set are  `provider: "staticman"` and `branch`. View the [full list of configurations](https://github.com/eduardoboucas/staticman#jekyll-configuration).
+Default settings have been provided in `_config.yml`. The important ones to set are  `provider: "staticman"`, `branch`, and `path`. View the [full list of configurations](https://github.com/eduardoboucas/staticman#jekyll-configuration).
 
 **Branch setting:** This is the branch comment files will be sent to via pull requests. If you host your site on GitHub Pages it will likely be `master` unless your repo is setup as a project --- use `gh-pages` in that case.
 {: .notice--info}

docs/_docs/18-history.md

@@ -4,9 +4,36 @@ permalink: /docs/history/
 excerpt: "Change log of enhancements and bug fixes made to the theme."
 sidebar:
   nav: docs
-modified: 2016-11-17T15:55:48-05:00
+modified: 2016-12-01T15:44:03-05:00
 ---
 
+## [4.0.10](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.10)
+
+### Bug Fixes
+
+- Add Staticman default `path`. [#683](https://github.com/mmistakes/minimal-mistakes/issues/683)
+
+### Maintenance
+
+- Slight correction/improvements to French UI text. [#685](https://github.com/mmistakes/minimal-mistakes/pull/685)
+
+## [4.0.9](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.9)
+
+### Bug Fixes
+
+- Fix overlapping sidebar navigation lists due to `max-height: 100vh`. [#668](https://github.com/mmistakes/minimal-mistakes/issues/668)
+
+## [4.0.8](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.8)
+
+### Bug Fixes
+
+- Set default value for `words_per_minute`. [#657](https://github.com/mmistakes/minimal-mistakes/issues/657)
+- Adjust sidebar navigation list CSS so it collapses at the correct width.
+
+### Maintenance
+
+- Add Google AdSense banner to `/docs/_layouts/default.html` for demo site.
+
 ## [4.0.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.7)
 
 ### Enhancements

docs/_includes/read-time.html

@@ -1,17 +1,15 @@
+{% assign words_per_minute = site.words_per_minute | default: 200 %}
+
 {% if post.read_time %}
   {% assign words = post.content | strip_html | number_of_words %}
 {% elsif page.read_time %}
   {% assign words = page.content | strip_html | number_of_words %}
 {% endif %}
 
-{% if site.words_per_minute %}
+{% if words < 180 %}
-  {% if words < 180 %}
+  {{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
-	  {{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
+{% elsif words < 360 %}
-	{% elsif words < 360 %}
+  1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
-	  1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
-	{% else %}
-	  {{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
-	{% endif %}
 {% else %}
-  {{ site.data.ui-text[site.locale].undefined_wpm | "Undefined parameter words_per_minute at _config.yml" }}
+  {{ words | divided_by:words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
 {% endif %}

docs/_layouts/default.html

@@ -15,6 +15,18 @@
 
     {{ content }}
 
+    <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+    <div align="center" style="margin: 1em 0;">
+    <ins class="adsbygoogle"
+         style="display:block; border-bottom: initial;"
+         data-ad-client="ca-pub-7328585512091257"
+         data-ad-slot="3049671934"
+         data-ad-format="auto"></ins>
+    </div>
+    <script>
+    (adsbygoogle = window.adsbygoogle || []).push({});
+    </script>
+
     <div class="page__footer">
       <footer>
         {% include footer/custom.html %}

docs/_pages/home.md

@@ -7,7 +7,7 @@ header:
   cta_label: "<i class='fa fa-download'></i> Install Now"
   cta_url: "/docs/quick-start-guide/"
   caption:
-excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.<br /> <small><a href="https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.7">Latest release v4.0.7</a></small><br /><br /> {::nomarkdown}<iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe> <iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe>{:/nomarkdown}'
+excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.<br /> <small><a href="https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.10">Latest release v4.0.10</a></small><br /><br /> {::nomarkdown}<iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe> <iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe>{:/nomarkdown}'
 feature_row:
   - image_path: /assets/images/mm-customizable-feature.png
     alt: "customizable"

docs/_sass/_navigation.scss

@@ -321,7 +321,7 @@
     display: none;
   }
 
-  @include breakpoint(max-width $large) {
+  @include breakpoint(max-width ($large - 1px)) {
 
     label {
       position: relative;
@@ -385,23 +385,23 @@
     input:checked + label:hover:after {
       transform: rotate(0);
     }
-  }
 
-  ul {
+    ul {
-    margin-bottom: 1em;
+      margin-bottom: 1em;
-  }
-
-  a {
-    display: block;
-    padding: 0.25em 0;
-
-    @include breakpoint($large) {
-      padding-top: 0.125em;
-      padding-bottom: 0.125em;
     }
 
-    &:hover {
+    a {
-      text-decoration: underline;
+      display: block;
+      padding: 0.25em 0;
+
+      @include breakpoint($large) {
+        padding-top: 0.125em;
+        padding-bottom: 0.125em;
+      }
+
+      &:hover {
+        text-decoration: underline;
+      }
     }
   }
 }
@@ -428,10 +428,10 @@
     }
   }
 
-  @include breakpoint(max-width $large) {
+  @include breakpoint(max-width ($large - 1px)) {
     position: relative;
     max-height: 0;
-    opacity: 0;
+    opacity: 0%;
     overflow: hidden;
     z-index: 10;
     -webkit-transition: 0.3s ease-in-out;
@@ -442,13 +442,13 @@
   }
 }
 
-@include breakpoint(max-width $large) {
+@include breakpoint(max-width ($large - 1px)) {
   .nav__list input:checked ~ .nav__items {
     -webkit-transition: 0.5s ease-in-out;
     transition: 0.5s ease-in-out;
-    max-height: 100vh;
+    max-height: 9999px; // exaggerate max-height to accommodate tall lists
-    opacity: 1;
     overflow: visible;
+    opacity: 1;
     margin-top: 1em;
     -webkit-transform: translate(0, 0);
         -ms-transform: translate(0, 0);

minimal-mistakes-jekyll.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name                    = "minimal-mistakes-jekyll"
-  spec.version                 = "4.0.7"
+  spec.version                 = "4.0.10"
   spec.authors                 = ["Michael Rose"]
 
   spec.summary                 = %q{A flexible two-column Jekyll theme.}

package.json

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

test/_data/ui-text.yml

@@ -105,7 +105,7 @@ fr: &DEFAULT_FR
   menu_label                 :
   toc_label                  : "Sur cette page"
   ext_link_label             : "Lien direct"
-  less_than                  : "plus petit que"
+  less_than                  : "moins de"
   minute_read                : "minute de lecture"
   share_on_label             : "Partager sur"
   meta_label                 :
@@ -115,8 +115,8 @@ fr: &DEFAULT_FR
   comments_label             : "Laisser un commentaire"
   comments_title             :
   more_label                 : "Lire plus"
-  related_label              : "Vous pourriez aimer"
+  related_label              : "Vous pourriez aimer aussi"
-  follow_label               : "Suivez moi"
+  follow_label               : "Contact"
   feed_label                 : "Flux"
   powered_by                 : "Propulsé par"
   website_label              : "Site"
@@ -132,7 +132,7 @@ fr: &DEFAULT_FR
   comment_form_website_label : "Site web (optionnel)"
   comment_btn_submit         : "Envoyer"
   comment_btn_submitted      : "Envoyé"
-  comment_success_msg        : "Merci pour votre comentaire, il sera visible sur le site une fois approuvé."
+  comment_success_msg        : "Merci pour votre commentaire, il sera visible sur le site une fois approuvé."
   comment_error_msg          : "Désolé, une erreur est survenue lors de la soumission. Vérifiez que les champs obligatoires ont été remplis et réessayez."
   loading_label              : "Chargement..."
 fr-FR: