github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/2174/head
REJack 2019-07-16 14:45:30 +02:00
parent 6c711a05ef
commit d61cbbd627
No known key found for this signature in database
GPG Key ID: 9F3976CC630CC888
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/js/Layout.js
View File

@ -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.

4
dist/js/adminlte.js vendored
View File

@ -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.

2
dist/js/adminlte.min.js vendored
View File

File diff suppressed because one or more lines are too long