Skip to content

Commit 77eba54

Browse files
139606: Match the old navbar spacing & use custom color variables for the user menu
1 parent 0147e8b commit 77eba54

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

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
@@ -26,7 +26,7 @@
2626
--ds-header-icon-color-hover: #{$ds-header-icon-color-hover};
2727

2828
--ds-navbar-bg: #{$ds-navbar-bg};
29-
--ds-navbar-item-padding: 0.25rem 0;
29+
--ds-navbar-item-padding: 0.5rem 0.25rem;
3030
--ds-navbar-link-color: #{$ds-navbar-link-color};
3131
--ds-navbar-link-bg: var(--ds-navbar-bg);
3232
--ds-navbar-link-color-hover: #{$ds-navbar-link-color-hover};
@@ -44,7 +44,7 @@
4444
--ds-expandable-navbar-item-padding: 0.25rem 0.5rem;
4545
@include media-breakpoint-up(md) {
4646
--ds-expandable-navbar-padding: 0.5rem 0;
47-
--ds-expandable-navbar-item-padding: 0.25rem 0.75rem;
47+
--ds-expandable-navbar-item-padding: 0.5rem 0.75rem;
4848
}
4949

5050
--ds-user-menu-bg: var(--ds-expandable-navbar-bg);
@@ -57,11 +57,12 @@
5757
--ds-user-menu-dropdown-link-color-hover: var(--ds-navbar-link-color-hover);
5858
--ds-user-menu-dropdown-link-bg-hover: var(--ds-navbar-link-bg-hover);
5959
@include media-breakpoint-up(md) {
60+
--ds-user-menu-bg: #{$ds-user-menu-bg};
6061
--ds-user-menu-item-padding: 0.25rem 1rem;
61-
--ds-user-menu-dropdown-link-color: var(--ds-expandable-navbar-link-color);
62-
--ds-user-menu-dropdown-link-bg: var(--ds-expandable-navbar-link-bg);
63-
--ds-user-menu-dropdown-link-color-hover: var(--ds-expandable-navbar-link-color-hover);
64-
--ds-user-menu-dropdown-link-bg-hover: var(--ds-expandable-navbar-link-bg-hover);
62+
--ds-user-menu-dropdown-link-color: #{$ds-user-menu-link-color};
63+
--ds-user-menu-dropdown-link-bg: var(--ds-user-menu-bg);
64+
--ds-user-menu-dropdown-link-color-hover: #{$ds-user-menu-link-color-hover};
65+
--ds-user-menu-dropdown-link-bg-hover: var(--ds-user-menu-bg);
6566
}
6667

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

0 commit comments

Comments
 (0)