Merge branch 'hotfix/3.3.2'

mmistakes · Jul 14, 2016 · 5ed2ded · 5ed2ded
2 parents 2a670aa + 22c289c
commit 5ed2ded
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [3.3.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.2)
+
+### Bug Fixes
+
+- Fix JavaScript that triggers "sticky" sidebar to avoid layout issues on screen sizes < `1024px`. [#396](https://github.com/mmistakes/minimal-mistakes/issues/396)
+
 ## [3.3.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.1)
 
 ### Enhancements

diff --git a/assets/js/_main.js b/assets/js/_main.js
@@ -11,7 +11,12 @@ $(document).ready(function(){
   $(".sticky").Stickyfill();
 
   var stickySideBar = function(){
-    if (!$(".author__urls-wrapper button").is(":visible")) {
+    var show = $(".author__urls-wrapper button").length === 0 ? $(window).width() > 1024 : !$(".author__urls-wrapper button").is(":visible");
+    // console.log("has button: " + $(".author__urls-wrapper button").length === 0);
+    // console.log("Window Width: " + windowWidth);
+    // console.log("show: " + show);
+    //old code was if($(window).width() > 1024)
+    if (show) {
       // fix
       Stickyfill.rebuild();
       Stickyfill.init();

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.3.1",
+  "version": "3.3.2",
   "description": "Minimal Mistakes Jekyll theme npm build scripts",
   "repository": {
     "type": "git",