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

Merge pull request #2323 from ColorlibHQ/fix-content-height-calculation 

fixed content height calculation
pull/2324/head
Raphael Jackstadt 2019-10-12 11:37:38 +02:00 committed by GitHub
parent e920e164e6 bd982813c4
commit 30b69da0b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/js/Layout.js
View File

@ -77,9 +77,11 @@ const Layout = (($) => {
const max = this._max(heights)
$(Selector.CONTENT).css('min-height', max - heights.footer)
$(Selector.CONTENT).css('min-height', max - heights.header)
if ($('body').hasClass(ClassName.LAYOUT_FIXED)) {
$(Selector.CONTENT).css('min-height', max - heights.header - heights.footer)
if (typeof $.fn.overlayScrollbars !== 'undefined') {
$(Selector.SIDEBAR).overlayScrollbars({
className : this._config.scrollbarTheme,