Browse Source

fixed content-wrapper height calculation if footer isn't there

REJack 5 years ago
parent
commit
d61cbbd627
3 changed files with 4 additions and 4 deletions
  1. 2 2
      build/js/Layout.js
  2. 2 2
      dist/js/adminlte.js
  3. 0 0
      dist/js/adminlte.min.js

+ 2 - 2
build/js/Layout.js

@@ -86,11 +86,11 @@
     $(Selector.layoutBoxed + ' > ' + Selector.wrapper).css('overflow', 'hidden');
 
     // Get window height and the wrapper height
-    var footerHeight = $(Selector.mainFooter).outerHeight() || 0;
+    var footerHeight  = $(Selector.mainFooter).outerHeight() || 0;
     var headerHeight  = $(Selector.mainHeader).outerHeight() || 0;
     var neg           = headerHeight + footerHeight;
     var windowHeight  = $(window).height();
-    var sidebarHeight = $(Selector.sidebar).height() || 0;
+    var sidebarHeight = $(Selector.sidebar).outerHeight() || 0;
 
     // Set the min-height of the content and sidebar based on
     // the height of the document.

+ 2 - 2
dist/js/adminlte.js

@@ -1053,11 +1053,11 @@ throw new Error('AdminLTE requires jQuery')
     $(Selector.layoutBoxed + ' > ' + Selector.wrapper).css('overflow', 'hidden');
 
     // Get window height and the wrapper height
-    var footerHeight = $(Selector.mainFooter).outerHeight() || 0;
+    var footerHeight  = $(Selector.mainFooter).outerHeight() || 0;
     var headerHeight  = $(Selector.mainHeader).outerHeight() || 0;
     var neg           = headerHeight + footerHeight;
     var windowHeight  = $(window).height();
-    var sidebarHeight = $(Selector.sidebar).height() || 0;
+    var sidebarHeight = $(Selector.sidebar).outerHeight() || 0;
 
     // Set the min-height of the content and sidebar based on
     // the height of the document.

File diff suppressed because it is too large
+ 0 - 0
dist/js/adminlte.min.js


Some files were not shown because too many files changed in this diff