Skip to content

Commit

Permalink
Merge pull request #3146 from danny007in/layout-size-fix
Browse files Browse the repository at this point in the history
layout size bug fixed
  • Loading branch information
REJack authored Nov 25, 2020
2 parents 3b6279a + 0a70c3c commit 17aea0e
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion build/js/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const CLASS_NAME_SIDEBAR_FOCUSED = 'sidebar-focused'
const CLASS_NAME_LAYOUT_FIXED = 'layout-fixed'
const CLASS_NAME_CONTROL_SIDEBAR_SLIDE_OPEN = 'control-sidebar-slide-open'
const CLASS_NAME_CONTROL_SIDEBAR_OPEN = 'control-sidebar-open'
const CLASS_NAME_LAYOUT_TOP_NAV = 'layout-top-nav'

const Default = {
scrollbarTheme: 'os-theme-light',
Expand Down Expand Up @@ -82,7 +83,11 @@ class Layout {

if (offset !== false) {
if (max === heights.controlSidebar) {
$contentSelector.css(this._config.panelAutoHeightMode, (max + offset))
if ($body.hasClass(CLASS_NAME_LAYOUT_TOP_NAV)) {
$contentSelector.css(this._config.panelAutoHeightMode, (max + offset) + heights.header + heights.footer)
} else {
$contentSelector.css(this._config.panelAutoHeightMode, (max + offset))
}
} else if (max === heights.window) {
$contentSelector.css(this._config.panelAutoHeightMode, (max + offset) - heights.header - heights.footer)
} else {
Expand Down Expand Up @@ -164,6 +169,10 @@ class Layout {
this.fixLayoutHeight()
})

$(document).ready(() => {
this.fixLayoutHeight()
})

setTimeout(() => {
$('body.hold-transition').removeClass('hold-transition')
}, 50)
Expand Down

0 comments on commit 17aea0e

Please sign in to comment.