diff --git a/resources/views/layouts/app/sidebar.blade.php b/resources/views/layouts/app/sidebar.blade.php index 74199c64..2c3483c5 100644 --- a/resources/views/layouts/app/sidebar.blade.php +++ b/resources/views/layouts/app/sidebar.blade.php @@ -148,7 +148,7 @@ display: block; } - .wms-sidebar-group:not([data-wms-menu-group="platform"])[data-wms-selected="true"] > .wms-sidebar-heading-button { + .wms-sidebar-group[data-wms-selected="true"] > .wms-sidebar-heading-button { position: relative; width: calc(100% - 1.25rem); min-height: 2.9rem; @@ -162,7 +162,7 @@ box-shadow: 0 8px 18px rgba(65, 100, 220, 0.22); } - .wms-sidebar-group:not([data-wms-menu-group="platform"])[data-wms-selected="true"] > .wms-sidebar-heading-button .wms-sidebar-icon { + .wms-sidebar-group[data-wms-selected="true"] > .wms-sidebar-heading-button .wms-sidebar-icon { color: #ffffff; } @@ -223,7 +223,7 @@ pointer-events: none; } - html[data-wms-sidebar="collapsed"] .wms-sidebar-group:not([data-wms-menu-group="platform"])[data-wms-selected="true"] > .wms-sidebar-heading-button, + html[data-wms-sidebar="collapsed"] .wms-sidebar-group[data-wms-selected="true"] > .wms-sidebar-heading-button, html[data-wms-sidebar="collapsed"] .wms-sidebar-link.is-active { width: 2.75rem; min-height: 2.75rem; @@ -253,7 +253,7 @@ display: none; } - .wms-sidebar-group:not([data-wms-menu-group="platform"])[data-wms-selected="true"] > .wms-sidebar-heading-button { + .wms-sidebar-group[data-wms-selected="true"] > .wms-sidebar-heading-button { width: calc(100% - 1.25rem); min-height: 2.85rem; margin: 0.25rem 0.65rem 0.35rem; @@ -312,11 +312,15 @@ @endphp @if($platformRoute) -
+
routeIs('platform.dashboard') || request()->routeIs('dashboard')) data-wms-selected="true" data-wms-has-active="true" @endif + > @@ -786,7 +790,9 @@ return child.matches('.wms-sidebar-heading-button.is-active'); }); - return activeHeading || (items ? items.querySelector('.wms-sidebar-link.is-active') !== null : false); + const routeSelectedGroup = group.dataset.wmsSelected === 'true' && group.dataset.wmsHasActive === 'true'; + + return routeSelectedGroup || activeHeading || (items ? items.querySelector('.wms-sidebar-link.is-active') !== null : false); } function setMenuGroupOpen(group, isOpen) {