Skip to content

Commit b621ed7

Browse files
committed
Fix #1276
1 parent 76e1d89 commit b621ed7

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

dist/js/app.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,13 +257,14 @@ function _init() {
257257
// Remove overflow from .wrapper if layout-boxed exists
258258
$(".layout-boxed > .wrapper").css('overflow', 'hidden');
259259
//Get window height and the wrapper height
260-
var neg = $('.main-header').outerHeight() + $('.main-footer').outerHeight();
260+
var footer_height = $('.main-footer').outerHeight() || 0;
261+
var neg = $('.main-header').outerHeight() + footer_height;
261262
var window_height = $(window).height();
262-
var sidebar_height = $(".sidebar").height();
263+
var sidebar_height = $(".sidebar").height() || 0;
263264
//Set the min-height of the content and sidebar based on the
264265
//the height of the document.
265266
if ($("body").hasClass("fixed")) {
266-
$(".content-wrapper, .right-side").css('min-height', window_height - $('.main-footer').outerHeight());
267+
$(".content-wrapper, .right-side").css('min-height', window_height - footer_height);
267268
} else {
268269
var postSetWidth;
269270
if (window_height >= sidebar_height) {

dist/js/app.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)