diff --git a/EdgeAdmin/web/views/@default/@layout_override.css b/EdgeAdmin/web/views/@default/@layout_override.css index a1006d1..15f738d 100644 --- a/EdgeAdmin/web/views/@default/@layout_override.css +++ b/EdgeAdmin/web/views/@default/@layout_override.css @@ -78,8 +78,8 @@ body.swal2-shown { border-radius: 3px; } :root { - --admin-top-nav-bg: #0a1f3f; - --admin-side-menu-bg: #1a4674; + --admin-top-nav-bg: #0a1f3f; + --admin-side-menu-bg: #0f2c54; } .top-nav.theme1, .top-nav.theme2, @@ -96,7 +96,9 @@ body.swal2-shown { .main-menu.theme4, .main-menu.theme5, .main-menu.theme6, -.main-menu.theme7, +.main-menu.theme7 { + background: var(--admin-side-menu-bg) !important; +} .main-menu.theme1 .menu, .main-menu.theme2 .menu, .main-menu.theme3 .menu, @@ -104,7 +106,8 @@ body.swal2-shown { .main-menu.theme5 .menu, .main-menu.theme6 .menu, .main-menu.theme7 .menu { - background: var(--admin-side-menu-bg) !important; + background: transparent !important; + background-image: none !important; } .main-menu .ui.menu .item.separator, .main-menu .ui.menu .sub-items .item.separator { @@ -117,6 +120,11 @@ body.swal2-shown { } .main-menu { top: 2.6em !important; + background: var(--admin-side-menu-bg) !important; +} +.main-menu .ui.menu { + min-height: 100% !important; + margin: 0 !important; } .main-menu > .ui.menu > .item:first-child:empty { display: none !important; diff --git a/EdgeAdmin/web/views/@default/@layout_override.less b/EdgeAdmin/web/views/@default/@layout_override.less index 1e70c0c..7d97a8f 100644 --- a/EdgeAdmin/web/views/@default/@layout_override.less +++ b/EdgeAdmin/web/views/@default/@layout_override.less @@ -110,7 +110,7 @@ body.swal2-shown { // Menu background colors only :root { --admin-top-nav-bg: #0a1f3f; - --admin-side-menu-bg: #1a4674; + --admin-side-menu-bg: #0f2c54; } .top-nav.theme1, @@ -129,7 +129,10 @@ body.swal2-shown { .main-menu.theme4, .main-menu.theme5, .main-menu.theme6, -.main-menu.theme7, +.main-menu.theme7 { + background: var(--admin-side-menu-bg) !important; +} + .main-menu.theme1 .menu, .main-menu.theme2 .menu, .main-menu.theme3 .menu, @@ -137,7 +140,8 @@ body.swal2-shown { .main-menu.theme5 .menu, .main-menu.theme6 .menu, .main-menu.theme7 .menu { - background: var(--admin-side-menu-bg) !important; + background: transparent !important; + background-image: none !important; } // Hide menu separators @@ -154,6 +158,12 @@ body.swal2-shown { // Align left menu with top nav and remove leading spacer item .main-menu { top: 2.6em !important; + background: var(--admin-side-menu-bg) !important; +} + +.main-menu .ui.menu { + min-height: 100% !important; + margin: 0 !important; } .main-menu > .ui.menu > .item:first-child:empty { diff --git a/EdgeUser/web/views/@default/@layout_override.css b/EdgeUser/web/views/@default/@layout_override.css index bcbc2b1..17d919e 100644 --- a/EdgeUser/web/views/@default/@layout_override.css +++ b/EdgeUser/web/views/@default/@layout_override.css @@ -60,9 +60,10 @@ textarea::-webkit-scrollbar { select.dropdown { height: auto !important; } +/* Menu background colors only */ :root { --admin-top-nav-bg: #0a1f3f; - --admin-side-menu-bg: #1a4674; + --admin-side-menu-bg: #0f2c54; } .top-nav, .top-nav.theme1, @@ -81,7 +82,9 @@ select.dropdown { .main-menu.theme4, .main-menu.theme5, .main-menu.theme6, -.main-menu.theme7, +.main-menu.theme7 { + background: var(--admin-side-menu-bg) !important; +} .main-menu .menu, .main-menu.theme1 .menu, .main-menu.theme2 .menu, @@ -90,7 +93,13 @@ select.dropdown { .main-menu.theme5 .menu, .main-menu.theme6 .menu, .main-menu.theme7 .menu { - background: var(--admin-side-menu-bg) !important; + background: transparent !important; + background-image: none !important; +} +.main-menu .ui.menu .item, +.main-menu .ui.menu .sub-items, +.main-menu .ui.menu .sub-items .item { + background: transparent !important; } .main-menu .ui.menu .item.separator, .main-menu .ui.menu .sub-items .item.separator { @@ -103,6 +112,11 @@ select.dropdown { } .main-menu { top: 2.6em !important; + background: var(--admin-side-menu-bg) !important; +} +.main-menu .ui.menu { + min-height: 100% !important; + margin: 0 !important; } .main-menu > .ui.menu > .item:first-child:empty { display: none !important; diff --git a/EdgeUser/web/views/@default/@layout_override.less b/EdgeUser/web/views/@default/@layout_override.less index b5466cc..c7518fe 100644 --- a/EdgeUser/web/views/@default/@layout_override.less +++ b/EdgeUser/web/views/@default/@layout_override.less @@ -79,10 +79,10 @@ select.dropdown { height: auto !important; } -// Menu background colors and separator cleanup +// Menu background colors only :root { --admin-top-nav-bg: #0a1f3f; - --admin-side-menu-bg: #1a4674; + --admin-side-menu-bg: #0f2c54; } .top-nav, @@ -103,7 +103,10 @@ select.dropdown { .main-menu.theme4, .main-menu.theme5, .main-menu.theme6, -.main-menu.theme7, +.main-menu.theme7 { + background: var(--admin-side-menu-bg) !important; +} + .main-menu .menu, .main-menu.theme1 .menu, .main-menu.theme2 .menu, @@ -112,9 +115,18 @@ select.dropdown { .main-menu.theme5 .menu, .main-menu.theme6 .menu, .main-menu.theme7 .menu { - background: var(--admin-side-menu-bg) !important; + background: transparent !important; + background-image: none !important; } +// Keep menu items transparent for unified menu background +.main-menu .ui.menu .item, +.main-menu .ui.menu .sub-items, +.main-menu .ui.menu .sub-items .item { + background: transparent !important; +} + +// Hide menu separators .main-menu .ui.menu .item.separator, .main-menu .ui.menu .sub-items .item.separator { display: none !important; @@ -128,6 +140,12 @@ select.dropdown { // Align left menu with top nav and remove leading spacer item .main-menu { top: 2.6em !important; + background: var(--admin-side-menu-bg) !important; +} + +.main-menu .ui.menu { + min-height: 100% !important; + margin: 0 !important; } .main-menu > .ui.menu > .item:first-child:empty {