|
@@ -257,13 +257,14 @@ function _init() {
|
|
|
// Remove overflow from .wrapper if layout-boxed exists
|
|
|
$(".layout-boxed > .wrapper").css('overflow', 'hidden');
|
|
|
//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 sidebar_height = $(".sidebar").height();
|
|
|
+ var sidebar_height = $(".sidebar").height() || 0;
|
|
|
//Set the min-height of the content and sidebar based on the
|
|
|
//the height of the document.
|
|
|
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 {
|
|
|
var postSetWidth;
|
|
|
if (window_height >= sidebar_height) {
|