maxmustermann/AdminLTE
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge #1847

Browse source
This commit is contained in:
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');
// Get window height and the wrapper height
var footerHeight = $(Selector.mainFooter).outerHeight() || 0;
var neg = $(Selector.mainHeader).outerHeight() + footerHeight;
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;

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

File diff suppressed because one or more lines are too long