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

fixed content height calc with less sidebar content (#2332)

pull/2333/head
Raphael Jackstadt 2019-10-16 08:34:07 +02:00 committed by GitHub
parent 302c85fb47
commit 29a3ba3953
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/js/Layout.js
View File

@ -77,7 +77,11 @@ const Layout = (($) => {
const max = this._max(heights)
$(Selector.CONTENT).css('min-height', max - heights.header)
if (max == heights.window) {
$(Selector.CONTENT).css('min-height', max - heights.header - heights.footer)
} else {
$(Selector.CONTENT).css('min-height', max - heights.header)
}
if ($('body').hasClass(ClassName.LAYOUT_FIXED)) {
$(Selector.CONTENT).css('min-height', max - heights.header - heights.footer)

6
dist/js/adminlte.js vendored
View File

@ -344,7 +344,11 @@
var max = this._max(heights);
$(Selector.CONTENT).css('min-height', max - heights.header);
if (max == heights.window) {
$(Selector.CONTENT).css('min-height', max - heights.header - heights.footer);
} else {
$(Selector.CONTENT).css('min-height', max - heights.header);
}
if ($('body').hasClass(ClassName.LAYOUT_FIXED)) {
$(Selector.CONTENT).css('min-height', max - heights.header - heights.footer);

2
dist/js/adminlte.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
dist/js/adminlte.min.js.map vendored
View File

File diff suppressed because one or more lines are too long