From 0a70c3c89fbffc62e9198bd62ee652b50e55696f Mon Sep 17 00:00:00 2001 From: Daniel <50356015+danny007in@users.noreply.github.com> Date: Wed, 25 Nov 2020 14:22:20 +0530 Subject: [PATCH] layout size bug fixed --- build/js/Layout.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build/js/Layout.js b/build/js/Layout.js index 88b442653f1..09609820f7f 100644 --- a/build/js/Layout.js +++ b/build/js/Layout.js @@ -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', @@ -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 { @@ -164,6 +169,10 @@ class Layout { this.fixLayoutHeight() }) + $(document).ready(() => { + this.fixLayoutHeight() + }) + setTimeout(() => { $('body.hold-transition').removeClass('hold-transition') }, 50)