Merge branch 'release/3.1.2'

CHANGELOG.md

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

_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: "/" %}
-            {% if nav_url == page.url %}
+            {% comment %}internal/external URL check{% endcomment %}
+            {% 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/sidebar.html

@@ -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-right: 2em;
+  padding-left: 1em;
+  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;
     }