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

Merge remote-tracking branch 'origin/main' into fix-notifications-issue

Browse Source 
# Conflicts:
#	src/app/root/root.component.html
This commit is contained in:
Giuseppe Digilio
2022-03-10 17:01:56 +01:00
parent 797e1882b8 1f26ca9566
commit 9335c4ebea
149 changed files with 25734 additions and 16254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
<div class="outer-wrapper" *ngIf="!shouldShowFullscreenLoader; else fullScreenLoader">
<ds-admin-sidebar></ds-admin-sidebar>
<ds-themed-admin-sidebar></ds-themed-admin-sidebar>
<div class="inner-wrapper" [@slideSidebarPadding]="{
value: (!(sidebarVisible | async) ? 'hidden' : (slideSidebarOver | async) ? 'shown' : 'expanded'),
params: {collapsedSidebarWidth: (collapsedSidebarWidth | async), totalSidebarWidth: (totalSidebarWidth | async)}
@@ -26,4 +26,4 @@
<div class="ds-full-screen-loader">
<ds-loading [showMessage]="false"></ds-loading>
</div>
</ng-template>
</ng-template>