diff --git a/resources/classes/menu.php b/resources/classes/menu.php index 4df58f2e85..c7ea193f58 100644 --- a/resources/classes/menu.php +++ b/resources/classes/menu.php @@ -1158,7 +1158,13 @@ if (!class_exists('menu')) { if ($_SESSION['theme']['menu_side_state']['text'] != 'expanded' && $_SESSION['theme']['menu_side_state']['text'] != 'hidden') { $content_container_onclick = "onclick=\"clearTimeout(menu_side_contract_timer); if ($(window).width() >= 576) { menu_side_contract(); }\""; } - $html .= "
\n"; + //explicitly set content container width when side menu enabled + switch ($_SESSION['theme']['menu_side_state']['text']) { + case 'expanded': $content_container_width = $_SESSION['theme']['menu_side_width_expanded']['text'] ?? 225; break; + case 'hidden': $content_container_width = 0; break; + default: $content_container_width = $_SESSION['theme']['menu_side_width_contracted']['text'] ?? 60; + } + $html .= "
\n"; $html .= "
\n"; //header: left $html .= "
\n"; diff --git a/resources/footer.php b/resources/footer.php index 000dbe3087..bd3f46044a 100644 --- a/resources/footer.php +++ b/resources/footer.php @@ -200,7 +200,7 @@ if ($_SESSION['theme']['menu_side_state']['text'] != 'hidden') { $menu_side_toggle = $_SESSION['theme']['menu_side_toggle']['text'] == 'hover' ? " onmouseenter=\"clearTimeout(menu_side_contract_timer); if ($('#menu_side_container').width() < 100) { menu_side_expand_start(); }\" onmouseleave=\"clearTimeout(menu_side_expand_timer); if ($('#menu_side_container').width() > 100 && $('#menu_side_state_current').val() != 'expanded') { menu_side_contract_start(); }\"" : null; } - $container_open = "