From 5682c81217c5da5090ad6cbb4cb561cbca5cd84c Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 13 May 2022 13:45:49 +0200
Subject: [PATCH] 91272: Fixed import statements and position of expandable
 navbar button

---
 .../themed-expandable-navbar-section.component.ts             | 4 ++--
 src/app/navbar/navbar.component.html                          | 4 ++--
 .../expandable-navbar-section.component.ts                    | 4 ++--
 src/themes/dspace/app/navbar/navbar.component.html            | 4 ++--
 src/themes/dspace/styles/_global-styles.scss                  | 3 +--
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts
index 744eeb5a02..e33dca4104 100644
--- a/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts
@@ -2,13 +2,13 @@ import { Component } from '@angular/core';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { ExpandableNavbarSectionComponent } from './expandable-navbar-section.component';
 import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator';
-import { MenuID } from '../../shared/menu/initial-menus-state';
+import { MenuID } from '../../shared/menu/menu-id.model';
 
 /**
  * Themed wrapper for ExpandableNavbarSectionComponent
  */
 @Component({
-  /* tslint:disable:component-selector */
+  /* eslint-disable @angular-eslint/component-selector */
   selector: 'li[ds-themed-expandable-navbar-section]',
   styleUrls: [],
   templateUrl: '../../shared/theme-support/themed.component.html',
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index 63f308fb32..b41f2ea706 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -4,7 +4,7 @@
     <div class="container">
         <div class="reset-padding-md w-100">
             <div id="collapsingNav">
-                <ul class="navbar-nav mr-auto shadow-none">
+                <ul class="navbar-nav navbar-navigation mr-auto shadow-none">
                     <ng-container *ngFor="let section of (sections | async)">
                         <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
                     </ng-container>
@@ -12,4 +12,4 @@
             </div>
         </div>
     </div>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 283b9ca6f6..f7efd1fdca 100644
--- a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -4,13 +4,13 @@ import {
 } from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component';
 import { slide } from '../../../../../app/shared/animations/slide';
 import { rendersSectionForMenu } from '../../../../../app/shared/menu/menu-section.decorator';
-import { MenuID } from '../../../../../app/shared/menu/initial-menus-state';
+import { MenuID } from '../../../../../app/shared/menu/menu-id.model';
 
 /**
  * Represents an expandable section in the navbar
  */
 @Component({
-  /* tslint:disable:component-selector */
+  /* eslint-disable @angular-eslint/component-selector */
   selector: 'li[ds-expandable-navbar-section]',
   // templateUrl: './expandable-navbar-section.component.html',
   templateUrl: '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.html',
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
index 218fc368ba..6b71728494 100644
--- a/src/themes/dspace/app/navbar/navbar.component.html
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -6,7 +6,7 @@
     </a>
 
     <div id="collapsingNav" class="w-100 h-100">
-      <ul class="navbar-nav me-auto mb-2 mb-lg-0 h-100">
+      <ul class="navbar-nav navbar-navigation me-auto mb-2 mb-lg-0 h-100">
         <ng-container *ngFor="let section of (sections | async)">
           <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
         </ng-container>
@@ -17,4 +17,4 @@
     <ds-themed-auth-nav-menu class="navbar-collapsed"></ds-themed-auth-nav-menu>
     <ds-impersonate-navbar class="navbar-collapsed"></ds-impersonate-navbar>
   </div>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/src/themes/dspace/styles/_global-styles.scss b/src/themes/dspace/styles/_global-styles.scss
index 8682e3dcdf..3271f15bf2 100644
--- a/src/themes/dspace/styles/_global-styles.scss
+++ b/src/themes/dspace/styles/_global-styles.scss
@@ -23,8 +23,7 @@
 }
 
 header {
-  li > .navbar-section,
-  li > .expandable-navbar-section {
+  .navbar-navigation > li {
     display: flex;
     flex-direction: column;
     justify-content: center;