Skip to content

Commit be59255

Browse files
authored
Merge pull request DSpace#2441 from alexandrevryghem/header-and-navbar-css-fixes_contribute-7.6
Minor css variables fixes for header & navbar
2 parents 1d7147e + 2ca2a38 commit be59255

6 files changed

Lines changed: 21 additions & 2 deletions

File tree

src/app/breadcrumbs/breadcrumbs.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
.breadcrumb {
66
border-radius: 0;
77
margin-top: calc(-1 * var(--ds-content-spacing));
8-
padding-bottom: var(--ds-content-spacing / 3);
9-
padding-top: var(--ds-content-spacing / 3);
8+
padding-bottom: calc(var(--ds-content-spacing) / 3);
9+
padding-top: calc(var(--ds-content-spacing) / 3);
1010
background-color: var(--ds-breadcrumb-bg);
1111
}
1212

src/app/header/header.component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
header {
2+
background-color: var(--ds-header-bg);
3+
}
4+
15
.navbar-brand img {
26
max-height: var(--ds-header-logo-height);
37
max-width: 100%;

src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@
66
}
77

88
.dropdown-menu {
9+
background-color: var(--ds-expandable-navbar-bg);
910
overflow: hidden;
1011
min-width: 100%;
1112
border-top-left-radius: 0;
1213
border-top-right-radius: 0;
1314
::ng-deep a.nav-link {
15+
color: var(--ds-expandable-navbar-link-color) !important;
1416
padding-right: var(--bs-spacer);
1517
padding-left: var(--bs-spacer);
1618
white-space: nowrap;
19+
20+
&:hover, &:focus {
21+
color: var(--ds-expandable-navbar-link-color-hover) !important;
22+
}
1723
}
1824
}
1925

src/app/navbar/navbar.component.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
nav.navbar {
2+
background-color: var(--ds-navbar-bg);
23
border-bottom: 1px var(--ds-header-navbar-border-bottom-color) solid;
34
align-items: baseline;
45
}

src/styles/_custom_variables.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,14 @@
2424
--ds-header-logo-height-xs: 50px;
2525
--ds-header-icon-color: #{$link-color};
2626
--ds-header-icon-color-hover: #{$link-hover-color};
27+
--ds-navbar-bg: var(--ds-header-bg);
2728
--ds-header-navbar-border-top-color: #{$white};
2829
--ds-header-navbar-border-bottom-color: #{$gray-400};
2930
--ds-navbar-link-color: #{$cyan};
3031
--ds-navbar-link-color-hover: #{darken($cyan, 15%)};
32+
--ds-expandable-navbar-bg: var(--ds-navbar-bg);
33+
--ds-expandable-navbar-link-color: var(--ds-navbar-link-color);
34+
--ds-expandable-navbar-link-color-hover: var(--ds-navbar-link-color-hover);
3135

3236
$admin-sidebar-bg: darken(#2B4E72, 17%);
3337
$admin-sidebar-active-bg: darken($admin-sidebar-bg, 3%);

src/themes/dspace/app/navbar/navbar.component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ nav.navbar {
44
align-items: baseline;
55
}
66

7+
.navbar-nav {
8+
background-color: var(--ds-navbar-bg);
9+
}
10+
711
/** Mobile menu styling **/
812
@media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
913
.navbar {

0 commit comments

Comments
 (0)