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

Layout Height Fixed (#3214)

pull/3246/head
Daniel 2020-12-22 14:47:18 +05:30 committed by GitHub
parent c426c01389
commit 077599d1cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build/js/Layout.js
View File

@ -50,8 +50,6 @@ class Layout {
constructor(element, config) { constructor(element, config) {
this._config = config this._config = config
this._element = element this._element = element
this._init()
} }
// Public // Public
@ -90,10 +88,6 @@ 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)
} }
@ -103,10 +97,6 @@ class Layout {
return return
} }
if (offset !== false) {
$contentSelector.css(this._config.panelAutoHeightMode, (max + offset) - heights.header - heights.footer)
}
if (typeof $.fn.overlayScrollbars !== 'undefined') { if (typeof $.fn.overlayScrollbars !== 'undefined') {
$(SELECTOR_SIDEBAR).overlayScrollbars({ $(SELECTOR_SIDEBAR).overlayScrollbars({
className: this._config.scrollbarTheme, className: this._config.scrollbarTheme,
@ -180,10 +170,6 @@ class Layout {
this.fixLayoutHeight() this.fixLayoutHeight()
}) })
$(document).ready(() => {
this.fixLayoutHeight()
})
setTimeout(() => { setTimeout(() => {
$('body.hold-transition').removeClass('hold-transition') $('body.hold-transition').removeClass('hold-transition')
}, 50) }, 50)
@ -236,13 +222,13 @@ $(window).on('load', () => {
Layout._jQueryInterface.call($('body')) Layout._jQueryInterface.call($('body'))
}) })
$(`${SELECTOR_SIDEBAR} a`).on('focusin', () => { $(`${SELECTOR_SIDEBAR} a`)
.on('focusin', () => {
$(SELECTOR_MAIN_SIDEBAR).addClass(CLASS_NAME_SIDEBAR_FOCUSED) $(SELECTOR_MAIN_SIDEBAR).addClass(CLASS_NAME_SIDEBAR_FOCUSED)
}) })
.on('focusout', () => {
$(`${SELECTOR_SIDEBAR} a`).on('focusout', () => {
$(SELECTOR_MAIN_SIDEBAR).removeClass(CLASS_NAME_SIDEBAR_FOCUSED) $(SELECTOR_MAIN_SIDEBAR).removeClass(CLASS_NAME_SIDEBAR_FOCUSED)
}) })
/** /**
* jQuery API * jQuery API

2
build/scss/_layout.scss
View File

@ -579,6 +579,8 @@ body:not(.layout-fixed) {
.control-sidebar-content { .control-sidebar-content {
height: calc(100vh - #{$main-header-height}); height: calc(100vh - #{$main-header-height});
overflow-y: auto;
scrollbar-width: thin;
} }
} }
} }