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

Fix #1276

pull/1311/head
Abdullah Almsaeed 2017-01-08 15:23:14 -05:00
parent 76e1d899d5
commit b621ed77f2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/js/app.js vendored
View File

@ -257,13 +257,14 @@ function _init() {
// Remove overflow from .wrapper if layout-boxed exists // Remove overflow from .wrapper if layout-boxed exists
$(".layout-boxed > .wrapper").css('overflow', 'hidden'); $(".layout-boxed > .wrapper").css('overflow', 'hidden');
//Get window height and the wrapper height //Get window height and the wrapper height
var neg = $('.main-header').outerHeight() + $('.main-footer').outerHeight(); var footer_height = $('.main-footer').outerHeight() || 0;
var neg = $('.main-header').outerHeight() + footer_height;
var window_height = $(window).height(); var window_height = $(window).height();
var sidebar_height = $(".sidebar").height(); var sidebar_height = $(".sidebar").height() || 0;
//Set the min-height of the content and sidebar based on the //Set the min-height of the content and sidebar based on the
//the height of the document. //the height of the document.
if ($("body").hasClass("fixed")) { if ($("body").hasClass("fixed")) {
$(".content-wrapper, .right-side").css('min-height', window_height - $('.main-footer').outerHeight()); $(".content-wrapper, .right-side").css('min-height', window_height - footer_height);
} else { } else {
var postSetWidth; var postSetWidth;
if (window_height >= sidebar_height) { if (window_height >= sidebar_height) {

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

File diff suppressed because one or more lines are too long