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

Updated app.js

pull/360/head
Abdullah Almsaeed 2015-04-19 18:41:56 -04:00
parent 654614067b
commit d4674d3a1d
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dist/js/app.js vendored
View File

@ -248,11 +248,22 @@ function _init() {
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 - $('.main-footer').outerHeight());
} else { } else {
var postSetWidth;
if (window_height >= sidebar_height) { if (window_height >= sidebar_height) {
$(".content-wrapper, .right-side").css('min-height', window_height - neg); $(".content-wrapper, .right-side").css('min-height', window_height - neg);
postSetWidth = window_height - neg;
} else { } else {
$(".content-wrapper, .right-side").css('min-height', sidebar_height); $(".content-wrapper, .right-side").css('min-height', sidebar_height);
postSetWidth = sidebar_height;
} }
//Fix for the control sidebar height
var controlSidebar = $($.AdminLTE.options.controlSidebarOptions.selector);
if(typeof controlSidebar !== "undefined") {
if(controlSidebar.height() > postSetWidth)
$(".content-wrapper, .right-side").css('min-height', controlSidebar.height());
}
} }
}, },
fixSidebar: function () { fixSidebar: function () {

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

File diff suppressed because one or more lines are too long