Browse Source

fixed content height calc with less sidebar content (#2332)

Raphael Jackstadt 5 years ago
parent
commit
29a3ba3953
5 changed files with 10 additions and 2 deletions
  1. 5 1
      build/js/Layout.js
  2. 5 1
      dist/js/adminlte.js
  3. 0 0
      dist/js/adminlte.js.map
  4. 0 0
      dist/js/adminlte.min.js
  5. 0 0
      dist/js/adminlte.min.js.map

+ 5 - 1
build/js/Layout.js

@@ -77,7 +77,11 @@ const Layout = (($) => {
 
       const max = this._max(heights)
 
-      $(Selector.CONTENT).css('min-height', max - heights.header)
+      if (max == heights.window) {
+        $(Selector.CONTENT).css('min-height', max - heights.header - heights.footer)
+      } else {
+        $(Selector.CONTENT).css('min-height', max - heights.header)
+      }
 
       if ($('body').hasClass(ClassName.LAYOUT_FIXED)) {
         $(Selector.CONTENT).css('min-height', max - heights.header - heights.footer)

+ 5 - 1
dist/js/adminlte.js

@@ -344,7 +344,11 @@
 
         var max = this._max(heights);
 
-        $(Selector.CONTENT).css('min-height', max - heights.header);
+        if (max == heights.window) {
+          $(Selector.CONTENT).css('min-height', max - heights.header - heights.footer);
+        } else {
+          $(Selector.CONTENT).css('min-height', max - heights.header);
+        }
 
         if ($('body').hasClass(ClassName.LAYOUT_FIXED)) {
           $(Selector.CONTENT).css('min-height', max - heights.header - heights.footer);

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


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


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


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