Merge branch 'release/3.2.12'

mmistakes · Jun 24, 2016 · b8076e1 · b8076e1
2 parents 356121e + c259fe9
commit b8076e1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## [3.2.12](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.12)
+
+### Enhancements
+
+- Remove window width "magic number" from sticky sidebar check in `main.js` for improved flexibility. [#375](https://github.com/mmistakes/minimal-mistakes/pull/375)
+
+### Bug Fixes
+
+- Fix author override conditional where a missing `authors.yml` would show broken sidebar content. Defaults to `site.author`. [#376](https://github.com/mmistakes/minimal-mistakes/pull/376)
+
 ## [3.2.11](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.11)
 
 ### Bug Fixes

diff --git a/_includes/author-profile.html b/_includes/author-profile.html
@@ -1,6 +1,6 @@
 {% include base_path %}
 
-{% if page.author %}
+{% if page.author and site.data.authors[page.author] %}
   {% assign author = site.data.authors[page.author] %}{% else %}{% assign author = site.author %}
 {% endif %}
 

diff --git a/assets/js/_main.js b/assets/js/_main.js
@@ -11,16 +11,15 @@ $(document).ready(function(){
   $(".sticky").Stickyfill();
 
   var stickySideBar = function(){
-    var windowWidth = $(window).width();
-    if (windowWidth > 1024) {
+    if (!$(".author__urls-wrapper button").is(":visible")) {
       // fix
       Stickyfill.rebuild();
       Stickyfill.init();
-      $(".author__urls").show()
+      $(".author__urls").show();
     } else {
       // unfix
       Stickyfill.stop();
-      $(".author__urls").hide()
+      $(".author__urls").hide();
     }
   };
 

diff --git a/assets/js/main.min.js b/assets/js/main.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "minimal-mistakes",
-  "version": "3.2.11",
+  "version": "3.2.12",
   "description": "Minimal Mistakes Jekyll theme npm build scripts",
   "repository": {
     "type": "git",