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

Merge #1847

pull/1900/merge
Abdullah Almsaeed 2018-07-14 17:40:00 -04:00
parent 1339932caa
commit c618c2814f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/js/adminlte.js vendored
View File

@ -601,8 +601,9 @@ throw new Error('AdminLTE requires jQuery')
$(Selector.layoutBoxed + ' > ' + Selector.wrapper).css('overflow', 'hidden'); $(Selector.layoutBoxed + ' > ' + Selector.wrapper).css('overflow', 'hidden');
// Get window height and the wrapper height // Get window height and the wrapper height
var footerHeight = $(Selector.mainFooter).outerHeight() || 0; var footerHeight = $(Selector.mainFooter).outerHeight() || 0;
var neg = $(Selector.mainHeader).outerHeight() + footerHeight; var headerHeight = $(Selector.mainHeader).outerHeight() || 0;
var neg = headerHeight + footerHeight;
var windowHeight = $(window).height(); var windowHeight = $(window).height();
var sidebarHeight = $(Selector.sidebar).height() || 0; var sidebarHeight = $(Selector.sidebar).height() || 0;

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

File diff suppressed because one or more lines are too long