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

fix min-height calculation with controlSidebar

pull/3159/head
REJack 2020-11-26 15:39:31 +01:00
parent 7a539747cc
commit 8196efdc5e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/js/Layout.js
View File

@ -61,7 +61,7 @@ class Layout {
let controlSidebar = 0 let controlSidebar = 0
if ($body.hasClass(CLASS_NAME_CONTROL_SIDEBAR_SLIDE_OPEN) || $body.hasClass(CLASS_NAME_CONTROL_SIDEBAR_OPEN) || extra === 'control_sidebar') { if ($body.hasClass(CLASS_NAME_CONTROL_SIDEBAR_SLIDE_OPEN) || $body.hasClass(CLASS_NAME_CONTROL_SIDEBAR_OPEN) || extra === 'control_sidebar') {
controlSidebar = $(SELECTOR_CONTROL_SIDEBAR_CONTENT).height() controlSidebar = $(SELECTOR_CONTROL_SIDEBAR_CONTENT).outerHeight()
} }
const heights = { const heights = {
@ -84,7 +84,7 @@ class Layout {
if (offset !== false) { if (offset !== false) {
if (max === heights.controlSidebar) { if (max === heights.controlSidebar) {
if ($body.hasClass(CLASS_NAME_LAYOUT_TOP_NAV)) { if ($body.hasClass(CLASS_NAME_LAYOUT_TOP_NAV)) {
$contentSelector.css(this._config.panelAutoHeightMode, (max + offset) + heights.header + heights.footer) $contentSelector.css(this._config.panelAutoHeightMode, (max + offset) - heights.header - heights.footer)
} else { } else {
$contentSelector.css(this._config.panelAutoHeightMode, (max + offset)) $contentSelector.css(this._config.panelAutoHeightMode, (max + offset))
} }
@ -94,6 +94,10 @@ class Layout {
$contentSelector.css(this._config.panelAutoHeightMode, (max + offset) - heights.header) $contentSelector.css(this._config.panelAutoHeightMode, (max + offset) - heights.header)
} }
if (heights.controlSidebar + heights.footer >= heights.sidebar && heights.controlSidebar != 0) {
$contentSelector.css(this._config.panelAutoHeightMode, (heights.controlSidebar + offset))
}
if (this._isFooterFixed()) { if (this._isFooterFixed()) {
$contentSelector.css(this._config.panelAutoHeightMode, parseFloat($contentSelector.css(this._config.panelAutoHeightMode)) + heights.footer) $contentSelector.css(this._config.panelAutoHeightMode, parseFloat($contentSelector.css(this._config.panelAutoHeightMode)) + heights.footer)
} }