Skip to content

Commit 4a4c01b

Browse files
Andrea Barbassogithub-actions[bot]
authored andcommitted
[DSC-1847][DSC-1966] fix navbar ui error
(cherry picked from commit 49b329e)
1 parent 40e213f commit 4a4c01b

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
::ng-deep {
3030
.ds-menu-item, .ds-menu-toggler-wrapper {
31-
white-space: nowrap;
3231
text-decoration: none;
3332
}
3433

src/themes/dspace/app/header/header.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<header id="main-site-header">
2-
<div class="container h-100 d-flex flex-row flex-wrap align-items-center justify-content-between gapx-3 gapy-2" id="main-site-header-container">
2+
<div class="container h-100 d-flex flex-row align-items-center justify-content-between gapx-3 gapy-2" id="main-site-header-container">
33
<!-- Logo and navbar wrapper -->
44
<div id="header-left"
55
[attr.role]="(isMobile$ | async) ? 'navigation' : 'presentation'"
66
[attr.aria-label]="(isMobile$ | async) ? ('nav.main.description' | translate) : null"
7-
class="h-100 flex-fill d-flex flex-row flex-nowrap justify-content-start align-items-center gapx-3">
7+
class="h-100 flex-fill d-flex flex-row flex-nowrap justify-content-start align-items-center gapx-3 flex-grow-1">
88
<a class="d-block my-2 my-md-0" routerLink="/home" [attr.aria-label]="'home.title' | translate">
99
<img id="header-logo" src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/>
1010
</a>
11-
<nav *ngIf="(isMobile$ | async) !== true" class="navbar navbar-expand p-0 align-items-stretch align-self-stretch" id="desktop-navbar" [attr.aria-label]="'nav.main.description' | translate">
11+
<nav *ngIf="(isMobile$ | async) !== true" class="navbar navbar-expand p-0 align-items-stretch align-self-stretch flex-grow-1 flex-shrink-1" id="desktop-navbar" [attr.aria-label]="'nav.main.description' | translate">
1212
<ds-navbar></ds-navbar>
1313
</nav>
1414
</div>
1515
<!-- Search bar and other menus -->
16-
<div id="header-right" class="h-100 d-flex flex-row flex-nowrap justify-content-end align-items-center gapx-1 ml-auto">
16+
<div id="header-right" class="h-100 d-flex flex-row flex-nowrap flex-shrink-0 justify-content-end align-items-center gapx-1 ml-auto">
1717
<ds-search-navbar></ds-search-navbar>
1818
<div role="menubar" class="h-100 d-flex flex-row flex-nowrap align-items-center gapx-1">
1919
<ds-lang-switch></ds-lang-switch>

src/themes/dspace/app/navbar/navbar.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
22
<ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
33
</ng-container>
4-
<div class="navbar-nav h-100 align-items-md-stretch gapx-3" role="menubar" id="main-site-navigation" [ngClass]="(isMobile$ | async) ? 'navbar-nav-mobile' : 'navbar-nav-desktop'">
4+
<div class="navbar-nav flex-shrink-1 h-100 align-items-md-stretch gapx-3" role="menubar" id="main-site-navigation" [ngClass]="(isMobile$ | async) ? 'navbar-nav-mobile' : 'navbar-nav-desktop'">
55
<ng-container *ngFor="let section of (sections | async)">
66
<ng-container
77
*ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>

0 commit comments

Comments
 (0)