Merge branch 'release/3.1.3'

mmistakes · Apr 27, 2016 · b0e9c10 · b0e9c10
2 parents 2e67f66 + 0103da2
commit b0e9c10
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## [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

diff --git a/_includes/group-by-array b/_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 -->
-  {% unless name == previous %}
+<!-- If not equal to previous then it must be unique as sorted -->
+{% unless name == previous %}
 
-    <!-- Push to group_names -->
-    {% assign group_names = group_names | push: name %}
-  {% endunless %}
+<!-- Push to group_names -->
+{% assign group_names = group_names | push: name %}
+{% endunless %}
 
-  {% assign previous = name %}
+{% assign previous = name %}
 {% endfor %}
 
 
 <!-- group_items -->
 {% for name in group_names %}
 
-  <!-- Collect if contains -->
-  {% assign __item = __empty_array %}
-  {% for __element in include.collection %}
-    {% if __element[include.field] contains name %}
-      {% assign __item = __item | push: __element %}
-    {% endif %}
-  {% endfor %}
-
-  <!-- Push to group_items -->
-  {% assign group_items = group_items | push: __item %}
+<!-- Collect if contains -->
+{% assign __item = __empty_array %}
+{% for __element in include.collection %}
+{% if __element[include.field] contains name %}
+{% assign __item = __item | push: __element %}
+{% endif %}
 {% endfor %}
+
+<!-- Push to group_items -->
+{% assign group_items = group_items | push: __item %}
+{% endfor %}
diff --git a/_includes/seo.html b/_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 %}

diff --git a/_includes/sidebar.html b/_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 %}

diff --git a/package.json b/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"
   }
 }