Merge branch 'release/3.1.3'

- If `twitter.username` is set and `author.twitter` is nil bad things happen.
- Close #289

CHANGELOG.md

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

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.

_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,25 +1,48 @@
 {% 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 "http" %}
+            {% 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 "http" %}
+              {% 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 %}
       </li>
     {% endfor %}
   </ul>
-</nav>
+</nav>
+
+

_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 %}
@@ -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,8 +1,8 @@
 {% 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 %}
@@ -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>

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/_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;
     }

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"
   }
 }