pull/1242/head
Abdullah Almsaeed 2016-11-06 13:19:15 -05:00
parent 8a7b80c64c
commit 6e2f5b0708
5 changed files with 13 additions and 8 deletions

View File

@ -4,7 +4,7 @@
*/
html,
body {
min-height: 100%;
height: 100%;
.layout-boxed & {
height: 100%;
}
@ -22,9 +22,10 @@ body {
/* Layout */
.wrapper {
.clearfix();
min-height: 100%;
height: 100%;
position: relative;
overflow: hidden;
overflow-x: hidden;
overflow-y: auto;
.layout-boxed & {
max-width: 1250px;
margin: 0 auto;

View File

@ -12,7 +12,7 @@
*/
html,
body {
min-height: 100%;
height: 100%;
}
.layout-boxed html,
.layout-boxed body {
@ -28,9 +28,10 @@ body {
}
/* Layout */
.wrapper {
min-height: 100%;
height: 100%;
position: relative;
overflow: hidden;
overflow-x: hidden;
overflow-y: auto;
}
.wrapper:before,
.wrapper:after {

File diff suppressed because one or more lines are too long

3
dist/js/app.js vendored
View File

@ -242,12 +242,15 @@ function _init() {
var _this = this;
_this.fix();
_this.fixSidebar();
$('body, html, .wrapper').css('height', 'auto');
$(window, ".wrapper").resize(function () {
_this.fix();
_this.fixSidebar();
});
},
fix: function () {
// 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 window_height = $(window).height();

2
dist/js/app.min.js vendored

File diff suppressed because one or more lines are too long