hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-16 14:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

91272: Fixed import statements and position of expandable navbar button

Browse Source
This commit is contained in:
Alexandre Vryghem
2022-05-13 13:45:49 +02:00
parent 7904cead76
commit 5682c81217
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts
View File

@@ -2,13 +2,13 @@ import { Component } from '@angular/core';
import { ThemedComponent } from '../../shared/theme-support/themed.component'; import { ThemedComponent } from '../../shared/theme-support/themed.component';
import { ExpandableNavbarSectionComponent } from './expandable-navbar-section.component'; import { ExpandableNavbarSectionComponent } from './expandable-navbar-section.component';
import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator'; 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 * Themed wrapper for ExpandableNavbarSectionComponent
*/ */
@Component({ @Component({
/* tslint:disable:component-selector */ /* eslint-disable @angular-eslint/component-selector */
selector: 'li[ds-themed-expandable-navbar-section]', selector: 'li[ds-themed-expandable-navbar-section]',
styleUrls: [], styleUrls: [],
templateUrl: '../../shared/theme-support/themed.component.html', templateUrl: '../../shared/theme-support/themed.component.html',

4
src/app/navbar/navbar.component.html
View File

@@ -4,7 +4,7 @@
<div class="container"> <div class="container">
<div class="reset-padding-md w-100"> <div class="reset-padding-md w-100">
<div id="collapsingNav"> <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 *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 *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
</ng-container> </ng-container>
@@ -12,4 +12,4 @@
</div> </div>
</div> </div>
</div> </div>
</nav> </nav>

4
src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
View File

@@ -4,13 +4,13 @@ import {
} from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component'; } from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component';
import { slide } from '../../../../../app/shared/animations/slide'; import { slide } from '../../../../../app/shared/animations/slide';
import { rendersSectionForMenu } from '../../../../../app/shared/menu/menu-section.decorator'; 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 * Represents an expandable section in the navbar
*/ */
@Component({ @Component({
/* tslint:disable:component-selector */ /* eslint-disable @angular-eslint/component-selector */
selector: 'li[ds-expandable-navbar-section]', selector: 'li[ds-expandable-navbar-section]',
// templateUrl: './expandable-navbar-section.component.html', // templateUrl: './expandable-navbar-section.component.html',
templateUrl: '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.html', templateUrl: '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.html',

4
src/themes/dspace/app/navbar/navbar.component.html
View File

@@ -6,7 +6,7 @@
</a> </a>
<div id="collapsingNav" class="w-100 h-100"> <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 *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 *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
</ng-container> </ng-container>
@@ -17,4 +17,4 @@
<ds-themed-auth-nav-menu class="navbar-collapsed"></ds-themed-auth-nav-menu> <ds-themed-auth-nav-menu class="navbar-collapsed"></ds-themed-auth-nav-menu>
<ds-impersonate-navbar class="navbar-collapsed"></ds-impersonate-navbar> <ds-impersonate-navbar class="navbar-collapsed"></ds-impersonate-navbar>
</div> </div>
</nav> </nav>

3
src/themes/dspace/styles/_global-styles.scss
View File

@@ -23,8 +23,7 @@
} }
header { header {
li > .navbar-section, .navbar-navigation > li {
li > .expandable-navbar-section {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;