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

Merge branch 'master' into w2p-62589_Item-mapper-update

Browse Source
This commit is contained in:
Kristof De Langhe
2019-09-30 10:37:02 +02:00
parent a2fb8a316b 2789996000
commit 3c8e35e4d2
3 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/header/header.component.scss
View File

@@ -8,3 +8,14 @@
background-image: none !important; background-image: none !important;
line-height: 1.5; line-height: 1.5;
} }
.navbar ::ng-deep {
a {
color: $header-icon-color;
&:hover, &focus {
color: darken($header-icon-color, 15%);
}
}
}

18
src/styles/_bootstrap_variables.scss
View File

@@ -1,16 +1,16 @@
@import '_themed_bootstrap_variables.scss'; @import '_themed_bootstrap_variables.scss';
/** Help Variables **/ /** Help Variables **/
$fa-fixed-width: 1.25rem; $fa-fixed-width: 1.25rem !default;
$icon-padding: 1rem; $icon-padding: 1rem !default;
$collapsed-sidebar-width: calculatePx($fa-fixed-width + (2 * $icon-padding)); $collapsed-sidebar-width: calculatePx($fa-fixed-width + (2 * $icon-padding)) !default;
$sidebar-items-width: 250px; $sidebar-items-width: 250px !default;
$total-sidebar-width: $collapsed-sidebar-width + $sidebar-items-width; $total-sidebar-width: $collapsed-sidebar-width + $sidebar-items-width !default;
/* Fonts */ /* Fonts */
$fa-font-path: "../assets/fonts"; $fa-font-path: "../assets/fonts" !default;
/* Images */ /* Images */
$image-path: "../assets/images"; $image-path: "../assets/images" !default;
/** Bootstrap Variables **/ /** Bootstrap Variables **/
/* Colors */ /* Colors */
@@ -44,8 +44,8 @@ $link-color: map-get($theme-colors, info) !default;
$navbar-dark-color: rgba(white, .5) !default; $navbar-dark-color: rgba(white, .5) !default;
$navbar-light-color: rgba(black, .5) !default; $navbar-light-color: rgba(black, .5) !default;
$navbar-dark-toggler-icon-bg: url("data%3Aimage%2Fsvg+xml%3Bcharset%3Dutf8%2C%3Csvg+viewBox%3D%270+0+30+30%27+xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%3E%3Cpath+stroke%3D%27#{$navbar-dark-color}%27+stroke-width%3D%272%27+stroke-linecap%3D%27round%27+stroke-miterlimit%3D%2710%27+d%3D%27M4+7h22M4+15h22M4+23h22%27%2F%3E%3C%2Fsvg%3E"); $navbar-dark-toggler-icon-bg: url("data%3Aimage%2Fsvg+xml%3Bcharset%3Dutf8%2C%3Csvg+viewBox%3D%270+0+30+30%27+xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%3E%3Cpath+stroke%3D%27#{$navbar-dark-color}%27+stroke-width%3D%272%27+stroke-linecap%3D%27round%27+stroke-miterlimit%3D%2710%27+d%3D%27M4+7h22M4+15h22M4+23h22%27%2F%3E%3C%2Fsvg%3E") !default;
$navbar-light-toggler-icon-bg: url("data%3Aimage%2Fsvg+xml%3Bcharset%3Dutf8%2C%3Csvg+viewBox%3D%270+0+30+30%27+xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%3E%3Cpath+stroke%3D%27#{$navbar-light-color}%27+stroke-width%3D%272%27+stroke-linecap%3D%27round%27+stroke-miterlimit%3D%2710%27+d%3D%27M4+7h22M4+15h22M4+23h22%27%2F%3E%3C%2Fsvg%3E"); $navbar-light-toggler-icon-bg: url("data%3Aimage%2Fsvg+xml%3Bcharset%3Dutf8%2C%3Csvg+viewBox%3D%270+0+30+30%27+xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%3E%3Cpath+stroke%3D%27#{$navbar-light-color}%27+stroke-width%3D%272%27+stroke-linecap%3D%27round%27+stroke-miterlimit%3D%2710%27+d%3D%27M4+7h22M4+15h22M4+23h22%27%2F%3E%3C%2Fsvg%3E") !default;
$enable-shadows: true !default; $enable-shadows: true !default;

53
src/styles/_custom_variables.scss
View File

@@ -1,38 +1,39 @@
@import '_themed_custom_variables.scss'; @import '_themed_custom_variables.scss';
$content-spacing: $spacer * 1.5; $content-spacing: $spacer * 1.5 !default;
$button-height: $input-btn-padding-y * 2 + $input-btn-line-height + calculateRem($input-btn-border-width*2); $button-height: $input-btn-padding-y * 2 + $input-btn-line-height + calculateRem($input-btn-border-width*2) !default;
$card-height-percentage:98%; $card-height-percentage:98% !default;
$card-thumbnail-height:240px; $card-thumbnail-height:240px !default;
$dropdown-menu-max-height: 200px; $dropdown-menu-max-height: 200px !default;
$drop-zone-area-height: 44px; $drop-zone-area-height: 44px !default;
$drop-zone-area-z-index: 1025; $drop-zone-area-z-index: 1025 !default;
$drop-zone-area-inner-z-index: 1021; $drop-zone-area-inner-z-index: 1021 !default;
$login-logo-height:72px; $login-logo-height:72px !default;
$login-logo-width:72px; $login-logo-width:72px !default;
$submission-header-z-index: 1001; $submission-header-z-index: 1001 !default;
$submission-footer-z-index: 999; $submission-footer-z-index: 999 !default;
$main-z-index: 0; $main-z-index: 0 !default;
$nav-z-index: 10; $nav-z-index: 10 !default;
$sidebar-z-index: 20; $sidebar-z-index: 20 !default;
$header-logo-height: 80px; $header-logo-height: 80px !default;
$header-logo-height-xs: 50px; $header-logo-height-xs: 50px !default;
$header-icon-color: $link-color !default;
$admin-sidebar-bg: darken(#2B4E72, 17%); $admin-sidebar-bg: darken(#2B4E72, 17%) !default;
$admin-sidebar-active-bg: darken($admin-sidebar-bg, 3%); $admin-sidebar-active-bg: darken($admin-sidebar-bg, 3%) !default;
$admin-sidebar-header-bg: darken($admin-sidebar-bg, 7%); $admin-sidebar-header-bg: darken($admin-sidebar-bg, 7%) !default;
$dark-scrollbar-background: $admin-sidebar-active-bg; $dark-scrollbar-background: $admin-sidebar-active-bg !default;
$dark-scrollbar-foreground: #47495d; $dark-scrollbar-foreground: #47495d !default;
$submission-sections-margin-bottom: .5rem !default; $submission-sections-margin-bottom: .5rem !default;
$edit-item-button-min-width: 100px; $edit-item-button-min-width: 100px !default;
$edit-item-metadata-field-width: 190px; $edit-item-metadata-field-width: 190px !default;
$edit-item-language-field-width: 43px; $edit-item-language-field-width: 43px !default;
$thumbnail-max-width: 175px; $thumbnail-max-width: 175px !default;