Merge pull request ColorlibHQ#62 from seven1m/footer

Account for (optional) footer in wrapper height calc.
elBarkey · Jul 3, 2014 · 6e4a3ae · 6e4a3ae
2 parents 5ad2be7 + 1d900be
commit 6e4a3ae
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/js/AdminLTE/app.js b/js/AdminLTE/app.js
@@ -101,7 +101,7 @@ $(function() {
      **/
     function _fix() {
         //Get window height and the wrapper height
-        var height = $(window).height() - $("body > .header").height();
+        var height = $(window).height() - $("body > .header").height() - ($("body > .footer").outerHeight() || 0);
         $(".wrapper").css("min-height", height + "px");
         var content = $(".wrapper").height();
         //If the wrapper height is greater than the window