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

#885 fix merge conflict

Browse Source
This commit is contained in:
Dániel Péter Sipos
2021-03-26 18:01:12 +01:00
parent 97e1b1dee1
commit 064c43a763
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/+item-page/item-page.module.ts
View File

@@ -27,6 +27,10 @@ import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal
import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module'; import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
import { ThemedItemPageComponent } from './simple/themed-item-page.component'; import { ThemedItemPageComponent } from './simple/themed-item-page.component';
import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component'; import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component';
import { MediaViewerComponent } from './media-viewer/media-viewer.component';
import { MediaViewerVideoComponent } from './media-viewer/media-viewer-video/media-viewer-video.component';
import { MediaViewerImageComponent } from './media-viewer/media-viewer-image/media-viewer-image.component';
import { NgxGalleryModule } from '@kolkov/ngx-gallery';
const ENTRY_COMPONENTS = [ const ENTRY_COMPONENTS = [
// put only entry components that use custom decorator // put only entry components that use custom decorator
@@ -54,6 +58,9 @@ const DECLARATIONS = [
ItemComponent, ItemComponent,
UploadBitstreamComponent, UploadBitstreamComponent,
AbstractIncrementalListComponent, AbstractIncrementalListComponent,
MediaViewerComponent,
MediaViewerVideoComponent,
MediaViewerImageComponent
]; ];
@NgModule({ @NgModule({

11
src/styles/_global-styles.scss
View File

@@ -36,7 +36,7 @@ body {
} }
ds-header-navbar-wrapper { ds-header-navbar-wrapper {
z-index: var(--ds-nav-z-index); z-index: 0;
} }
ds-admin-sidebar { ds-admin-sidebar {
@@ -47,3 +47,12 @@ ds-admin-sidebar {
.ds-full-screen-loader { .ds-full-screen-loader {
height: 100vh; height: 100vh;
} }
.media-viewer
.change-gallery
.ngx-gallery
ngx-gallery-preview.ngx-gallery-active {
right: 0;
left: auto;
width: 96%;
}