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

Merge remote-tracking branch 'origin/master' into submission

Browse Source 
# Conflicts:
#	resources/i18n/en.json
#	src/app/app.component.scss
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/app.module.ts
#	src/app/shared/chips/chips.component.spec.ts
#	src/app/shared/chips/models/chips-item.model.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.html
#	src/app/shared/shared.module.ts
#	yarn.lock
This commit is contained in:
Giuseppe Digilio
2018-12-20 17:02:46 +01:00
parent 5068f160de 2055f3216d
commit eda0ebb21c
139 changed files with 5385 additions and 1975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/styles/_custom_variables.scss
View File

@@ -12,3 +12,16 @@ $login-logo-width:72px;
$submission-header-z-index: 1001;
$submission-footer-z-index: 1000;
$main-z-index: 0;
$nav-z-index: 10;
$sidebar-z-index: 20;
$header-logo-height: 80px;
$header-logo-height-xs: 50px;
$admin-sidebar-bg: $dark;
$admin-sidebar-active-bg: darken($dark, 3%);
$admin-sidebar-header-bg: darken($dark, 7%);
$dark-scrollbar-background: $admin-sidebar-active-bg;
$dark-scrollbar-foreground: #47495d;