From 9e2649b8b77827359268ad39cf0d4e8065f3dae5 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 27 Sep 2024 14:29:49 +0200
Subject: [PATCH] Fix top menu dropdown nested lists

---
 .../menu/top-menu-dropdown.component.html            | 12 +++++-------
 client/src/sass/ng-select.scss                       |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/client/src/app/shared/shared-main/menu/top-menu-dropdown.component.html b/client/src/app/shared/shared-main/menu/top-menu-dropdown.component.html
index a95738aff..02fc155bf 100644
--- a/client/src/app/shared/shared-main/menu/top-menu-dropdown.component.html
+++ b/client/src/app/shared/shared-main/menu/top-menu-dropdown.component.html
@@ -1,10 +1,8 @@
-<div class="sub-menu" [ngClass]="{ 'sub-menu-fixed': !isBroadcastMessageDisplayed, 'no-scroll': isModalOpened }">
-  <ul *ngFor="let menuEntry of menuEntries; index as id">
-
+<ul class="sub-menu" [ngClass]="{ 'sub-menu-fixed': !isBroadcastMessageDisplayed, 'no-scroll': isModalOpened }">
+  <ng-container *ngFor="let menuEntry of menuEntries; index as id">
     @if (isDisplayed(menuEntry)) {
-
       @if (menuEntry.routerLink) {
-        <li *ngIf="menuEntry.routerLink && isDisplayed(menuEntry)">
+        <li>
           <a
             class="sub-menu-entry" [routerLink]="menuEntry.routerLink" routerLinkActive="active"
             #routerLink (click)="onActiveLinkScrollToTop(routerLink)" ariaCurrentWhenActive="page"
@@ -40,8 +38,8 @@
         </li>
       }
     }
-  </ul>
-</div>
+  </ng-container>
+</ul>
 
 <ng-template #modal let-close="close" let-dismiss="dismiss">
   <div class="modal-body">
diff --git a/client/src/sass/ng-select.scss b/client/src/sass/ng-select.scss
index 57db4c1af..9a9de0e36 100644
--- a/client/src/sass/ng-select.scss
+++ b/client/src/sass/ng-select.scss
@@ -14,7 +14,7 @@ $ng-select-bg: pvar(--mainBackgroundColor);
 $ng-select-selected: color.adjust($main-color, $lightness: 40%);
 // $ng-select-selected-text: $ng-select-primary-text !default;
 
-$ng-select-marked: pvar(--mainColorLightest);
+$ng-select-marked: pvar(--mainColorVeryLight);
 // $ng-select-marked-text: $ng-select-primary-text !default;
 
 $ng-select-box-shadow: #{$focus-box-shadow-form} pvar(--mainColorLightest);