Merge branch 'hotfix/3.2.6'

- Remove extra white-space
- Close #317

CHANGELOG.md

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

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/)
 

_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

@@ -27,10 +27,44 @@ 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"
+  minutes_read          : "minutos 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
+
 # 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/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,7 +20,7 @@
   {% 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 }}"
@@ -28,7 +28,7 @@
         {% 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 }}"
@@ -37,7 +37,7 @@
       </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 }}"

_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 %}
@@ -44,5 +44,3 @@
     {% endfor %}
   </ul>
 </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 %}

_includes/read-time.html

@@ -4,6 +4,7 @@
   {% assign words = page.content | strip_html | number_of_words %}
 {% endif %}
 
+{% 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 %}
@@ -11,3 +12,6 @@
 	{% else %}
 	  {{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minutes_read }}
 	{% endif %}
+{% else %}
+  {{ 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,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 %}

_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,17 +3,25 @@
    ========================================================================== */
 
 .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;
+
+  footer {
+    @include container;
+    @include clearfix;
+    margin-top: 2em;
+    padding: 0 1em 2em;
 
     @include breakpoint($x-large) {
       max-width: $x-large;
     }
+  }
 
   a {
     color: inherit;
@@ -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/_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/_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.6",
   "description": "Minimal Mistakes Jekyll theme npm build scripts",
   "repository": {
     "type": "git",