Updated app.js

LMUFC · Apr 19, 2015 · d4674d3 · d4674d3
1 parent 6546140
commit d4674d3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/dist/js/app.js b/dist/js/app.js
@@ -248,11 +248,22 @@ function _init() {
       if ($("body").hasClass("fixed")) {
         $(".content-wrapper, .right-side").css('min-height', window_height - $('.main-footer').outerHeight());
       } else {
+        var postSetWidth;
         if (window_height >= sidebar_height) {
           $(".content-wrapper, .right-side").css('min-height', window_height - neg);
+          postSetWidth = window_height - neg;
         } else {
           $(".content-wrapper, .right-side").css('min-height', sidebar_height);
+          postSetWidth = sidebar_height;
         }
+
+        //Fix for the control sidebar height
+        var controlSidebar = $($.AdminLTE.options.controlSidebarOptions.selector);
+        if(typeof controlSidebar !== "undefined") {
+          if(controlSidebar.height() > postSetWidth)
+            $(".content-wrapper, .right-side").css('min-height', controlSidebar.height());
+        }
+
       }
     },
     fixSidebar: function () {

diff --git a/dist/js/app.min.js b/dist/js/app.min.js