Styling and menu improvements

codedmonkey · Oct 8, 2024 · c23f04e · c23f04e
1 parent 71a466b
commit c23f04e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/public/assets/conductor-theme.css b/public/assets/conductor-theme.css
@@ -1,9 +1,9 @@
 :root {
-  --color-primary: #A4133C;
+  --color-primary: #22181C;
 
-  --page-login-bg: #997080;
+  --page-login-bg: var(--color-primary);
 
-  --sidebar-bg: #22181C;
+  --sidebar-bg: var(--color-primary);
   --sidebar-logo-color: var(--true-gray-200);
   --sidebar-menu-color: var(--true-gray-200);
   --sidebar-menu-header-color: var(--gray-400);
@@ -13,3 +13,7 @@
 
   --resize-handler-hover-bg: #835D6C;
 }
+
+.nav-pills {
+  --bs-nav-pills-link-active-bg: var(--color-primary);
+}
diff --git a/src/Controller/Dashboard/DashboardRootController.php b/src/Controller/Dashboard/DashboardRootController.php
@@ -45,10 +45,16 @@ public function configureAssets(): Assets
 
     public function configureMenuItems(): iterable
     {
+        $request = $this->container->get('request_stack')->getCurrentRequest();
         $user = $this->getUser();
 
+        $packagesItem = MenuItem::linkToRoute('Packages', 'fa fa-cubes', 'dashboard_packages');
+        if (str_starts_with($request->query->get('routeName'), 'dashboard_packages_')) {
+            $packagesItem->getAsDto()->setSelected(true);
+        }
+
         yield MenuItem::linkToDashboard('Dashboard', 'fa fa-home');
-        yield MenuItem::linkToRoute('Packages', 'fa fa-cubes', 'dashboard_packages');
+        yield $packagesItem;
 
         yield MenuItem::section('Personal');
         if ($user) {

diff --git a/templates/dashboard/packages/package_header.html.twig b/templates/dashboard/packages/package_header.html.twig
@@ -4,12 +4,12 @@
   <li class="nav-item">
     {% set packageInfoUrl = ea_url()
       .setRoute('dashboard_packages_info', {packageName: package.name}) %}
-    <a {% if currentPage == 'info' %}class="nav-link active" aria-current="page"{% else %}class="nav-link"{% endif%} href="{{ packageInfoUrl }}">Info</a>
+    <a {% if currentPage == 'info' %}class="nav-link active" aria-current="page"{% else %}class="nav-link text-primary"{% endif%} href="{{ packageInfoUrl }}">Info</a>
   </li>
   <li class="nav-item">
     {% set packageVersionsUrl = ea_url()
       .setRoute('dashboard_packages_versions', {packageName: package.name}) %}
-    <a {% if currentPage == 'versions' %}class="nav-link active" aria-current="page"{% else %}class="nav-link"{% endif%} href="{{ packageVersionsUrl }}">Versions</a>
+    <a {% if currentPage == 'versions' %}class="nav-link active" aria-current="page"{% else %}class="nav-link text-primary"{% endif%} href="{{ packageVersionsUrl }}">Versions</a>
   </li>
   <li class="nav-item">
     <span class="nav-link disabled">Dependants</span>