Skip to content

Commit 7fbaa88

Browse files
Merge branch 'css-navbar-fixes_contribute-9.0' into css-navbar-fixes_contribute-main
2 parents 4169fc0 + 77eba54 commit 7fbaa88

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

src/styles/_bootstrap_variables.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ $ds-expandable-navbar-bg: #fff !default;
9393
$ds-navbar-link-color: $link-color !default;
9494
$ds-navbar-link-color-hover: #{darken($ds-navbar-link-color, 15%)} !default;
9595

96+
$ds-user-menu-bg: #fff !default;
97+
$ds-user-menu-link-color: $link-color !default;
98+
$ds-user-menu-link-color-hover: #{darken($ds-user-menu-link-color, 15%)} !default;
99+
96100
$ds-slider-color: darken(#94BA65, 17%) !default;
97101
$ds-slider-handle-color: darken(#2B4E72, 17%) !default;
98102

src/styles/_custom_variables.scss

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
--ds-header-icon-color-hover: #{$ds-header-icon-color-hover};
2929

3030
--ds-navbar-bg: #{$ds-navbar-bg};
31-
--ds-navbar-item-padding: 0.25rem 0;
31+
--ds-navbar-item-padding: 0.5rem 0.25rem;
3232
--ds-navbar-link-color: #{$ds-navbar-link-color};
3333
--ds-navbar-link-bg: var(--ds-navbar-bg);
3434
--ds-navbar-link-color-hover: #{$ds-navbar-link-color-hover};
@@ -46,7 +46,7 @@
4646
--ds-expandable-navbar-item-padding: 0.25rem 0.5rem;
4747
@include media-breakpoint-up(md) {
4848
--ds-expandable-navbar-padding: 0.5rem 0;
49-
--ds-expandable-navbar-item-padding: 0.25rem 0.75rem;
49+
--ds-expandable-navbar-item-padding: 0.5rem 0.75rem;
5050
}
5151

5252
--ds-user-menu-bg: var(--ds-expandable-navbar-bg);
@@ -59,11 +59,12 @@
5959
--ds-user-menu-dropdown-link-color-hover: var(--ds-navbar-link-color-hover);
6060
--ds-user-menu-dropdown-link-bg-hover: var(--ds-navbar-link-bg-hover);
6161
@include media-breakpoint-up(md) {
62+
--ds-user-menu-bg: #{$ds-user-menu-bg};
6263
--ds-user-menu-item-padding: 0.25rem 1rem;
63-
--ds-user-menu-dropdown-link-color: var(--ds-expandable-navbar-link-color);
64-
--ds-user-menu-dropdown-link-bg: var(--ds-expandable-navbar-link-bg);
65-
--ds-user-menu-dropdown-link-color-hover: var(--ds-expandable-navbar-link-color-hover);
66-
--ds-user-menu-dropdown-link-bg-hover: var(--ds-expandable-navbar-link-bg-hover);
64+
--ds-user-menu-dropdown-link-color: #{$ds-user-menu-link-color};
65+
--ds-user-menu-dropdown-link-bg: var(--ds-user-menu-bg);
66+
--ds-user-menu-dropdown-link-color-hover: #{$ds-user-menu-link-color-hover};
67+
--ds-user-menu-dropdown-link-bg-hover: var(--ds-user-menu-bg);
6768
}
6869

6970
@include media-breakpoint-up(md) {

0 commit comments

Comments
 (0)