diff --git a/resources/images/dspace-logo-mini.svg b/resources/images/dspace-logo-mini.svg new file mode 100644 index 0000000000..6ca41addc8 --- /dev/null +++ b/resources/images/dspace-logo-mini.svg @@ -0,0 +1,23 @@ + + + + + + diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts index 2f0bfdeddb..286322b237 100644 --- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts @@ -7,7 +7,6 @@ import { PaginatedList } from '../../../core/data/paginated-list'; import { MetadataField } from '../../../core/metadata/metadatafield.model'; import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; -import { SortOptions } from '../../../core/cache/models/sort-options.model'; @Component({ selector: 'ds-metadata-schema', diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.html b/src/app/+admin/admin-sidebar/admin-sidebar.component.html new file mode 100644 index 0000000000..9e24410312 --- /dev/null +++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.html @@ -0,0 +1,112 @@ + \ No newline at end of file diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.scss b/src/app/+admin/admin-sidebar/admin-sidebar.component.scss new file mode 100644 index 0000000000..aa4c3b9f89 --- /dev/null +++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.scss @@ -0,0 +1,8 @@ +@import '../../../styles/variables.scss'; +:host { + position: absolute; + .sidebar-sub-level-items { + list-style: disc; + color: $navbar-dark-color; + } +} \ No newline at end of file diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts new file mode 100644 index 0000000000..1310edd5e8 --- /dev/null +++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'ds-admin-sidebar', + templateUrl: './admin-sidebar.component.html', + styleUrls: ['./admin-sidebar.component.scss'], +}) +export class AdminSidebarComponent { + +} \ No newline at end of file diff --git a/src/app/app.component.html b/src/app/app.component.html index 41171d3081..a289e18953 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,4 +1,6 @@
+ +
diff --git a/src/app/app.component.scss b/src/app/app.component.scss index 8e5031d0ba..b645074aa5 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -37,3 +37,7 @@ body { ds-header-navbar-wrapper { z-index: $nav-z-index; } + +ds-admin-sidebar { + z-index: $sidebar-z-index; +} diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0aceaf2ef6..5a9c91386b 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -33,6 +33,7 @@ import { NotificationComponent } from './shared/notifications/notification/notif import { SharedModule } from './shared/shared.module'; import { NavbarComponent } from './navbar/navbar.component'; import { HeaderNavbarWrapperComponent } from './header-nav-wrapper/header-navbar-wrapper.component'; +import { AdminSidebarComponent } from './+admin/admin-sidebar/admin-sidebar.component'; export function getConfig() { return ENV_CONFIG; @@ -91,6 +92,7 @@ if (!ENV_CONFIG.production) { HeaderComponent, NavbarComponent, HeaderNavbarWrapperComponent, + AdminSidebarComponent, FooterComponent, PageNotFoundComponent, NotificationComponent, diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts index e58d56ee94..dd26f1bc46 100644 --- a/src/app/navbar/navbar.component.ts +++ b/src/app/navbar/navbar.component.ts @@ -21,8 +21,6 @@ export class NavbarComponent { ) { } - - openDropdownOnHover(dropdown: any): void { this.windowService.isXsOrSm().pipe( first() diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss index 7039a8c3c1..d9e7f5eadd 100644 --- a/src/styles/_bootstrap_variables.scss +++ b/src/styles/_bootstrap_variables.scss @@ -9,12 +9,14 @@ $gray-800: lighten($gray-base, 26.6%) !default; // #444 $gray-700: lighten($gray-base, 46.6%) !default; // #777 $gray-600: lighten($gray-base, 73.3%) !default; // #bbb $gray-100: lighten($gray-base, 93.5%) !default; // #eee + /* Reassign color vars to semantic color scheme */ $blue: #2B4E72 !default; $green: #94BA65 !default; $cyan: #2790B0 !default; $yellow: #EBBB54 !default; $red: #CF4444 !default; +$dark: #132333 !default; $theme-colors: ( primary: $blue, @@ -24,7 +26,7 @@ $theme-colors: ( warning: $yellow, danger: $red, light: $gray-100, - dark: $blue + dark: $dark ) !default; /* Fonts */ $link-color: map-get($theme-colors, info) !default; diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss index 3ae9e79265..3ee33822c6 100644 --- a/src/styles/_custom_variables.scss +++ b/src/styles/_custom_variables.scss @@ -11,5 +11,6 @@ $login-logo-width:72px; $main-z-index: 0; $nav-z-index: 10; +$sidebar-z-index: 20; $header-logo-height: 80px;