Skip to content

Commit 8242489

Browse files
committed
Simplify CSS relating to navbar
1 parent d85e1e7 commit 8242489

File tree

2 files changed

+20
-52
lines changed

2 files changed

+20
-52
lines changed

forwards-dark.scss

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,9 @@ div.callout.callout-style-default.callout-caution.callout-titled > div.callout-h
8383
--mt-color-bg-hover:#{$darkpurple} !important;
8484
}
8585

86-
.navbar-nav .dropdown-menu .dropdown-item:hover {
86+
// bg-color on dropdown menu and tool items
87+
.navbar-nav .dropdown-menu .dropdown-item:hover,
88+
.dropdown-item.quarto-navbar-tools-item:hover{
8789
background-color: $darkpurple;
8890
}
8991

90-
.dropdown-item.quarto-navbar-tools-item:hover {
91-
background-color: $darkpurple;
92-
}

forwards-light.scss

Lines changed: 17 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,6 @@ $callout-color-important: $red;
6060
color: $primary;
6161
}
6262

63-
#quarto-header > nav > div > div.navbar-brand-container.mx-auto > a:hover {
64-
color: $orange;
65-
}
66-
67-
#navbarCollapse > ul > li > a:hover {
68-
color: $orange;
69-
}
70-
71-
#navbarCollapse > ul > li > a.active {
72-
color: $orange;
73-
}
74-
7563
// code
7664
pre.sourceCode {
7765
border-radius: 0;
@@ -137,50 +125,31 @@ iframe.slide-deck {
137125
--mt-color-bg-hover:#{$darkpurple10} !important;
138126
}
139127

140-
.navbar-nav .dropdown-menu .dropdown-item:hover {
141-
background-color: $darkpurple10;
128+
// navbar
129+
#quarto-header > nav > div > div.navbar-brand-container.mx-auto > a:hover {
130+
color: $orange;
142131
}
143132

144-
.dropdown-item.quarto-navbar-tools-item:hover {
145-
background-color: $darkpurple10;
133+
#navbarCollapse > ul > li > a:hover,
134+
#navbarCollapse > ul > li > a.active {
135+
color: $orange;
146136
}
147137

148-
/* Keep dropdown toggle orange when dropdown is open and items are being hovered */
149-
.navbar-nav .dropdown.show .dropdown-toggle,
150-
.navbar-nav .dropdown:hover .dropdown-toggle {
151-
color: $orange !important;
138+
// bg-color on dropdown menu and tool items
139+
.navbar-nav .dropdown-menu .dropdown-item:hover,
140+
.dropdown-item.quarto-navbar-tools-item:hover{
141+
background-color: $darkpurple10;
152142
}
153143

154-
/* Tools dropdown toggle hover - make it orange */
144+
/* All dropdown toggles - hover, open, and focus states */
145+
.navbar-nav .dropdown-toggle:hover,
146+
.navbar-nav .dropdown.show .dropdown-toggle,
147+
.navbar-nav .dropdown:hover .dropdown-toggle,
155148
.quarto-navbar-tools .dropdown-toggle:hover,
156-
.quarto-navbar-tools a.dropdown-toggle:hover {
157-
color: $orange !important;
158-
}
159-
160-
/* Keep tools dropdown toggle orange when dropdown is open and you're hovering items */
161149
.quarto-navbar-tools.show .dropdown-toggle,
162150
.quarto-navbar-tools:hover .dropdown-toggle,
163-
.quarto-navbar-tools .dropdown.show .dropdown-toggle {
164-
color: $orange !important;
165-
}
166-
167-
/* Force regular navbar dropdown toggle to stay orange when open */
168-
.navbar-nav .nav-item.dropdown.show > .nav-link.dropdown-toggle,
169-
.navbar-nav .nav-item.dropdown.show > .dropdown-toggle,
170-
.navbar-nav .dropdown.show > .dropdown-toggle {
171-
color: $orange !important;
172-
}
173-
174-
/* Force tools dropdown toggle to stay orange when open */
175-
.quarto-navbar-tools.show > .dropdown-toggle,
176-
.quarto-navbar-tools.show > a.dropdown-toggle,
177-
div[class*="quarto-navbar-tools"].show > a,
178-
div[class*="quarto-navbar-tools"][aria-expanded="true"] > a {
179-
color: $orange !important;
180-
}
181-
182-
/* Catch any focus states that might be interfering */
151+
.quarto-navbar-tools .dropdown.show .dropdown-toggle,
183152
.dropdown-toggle:focus,
184153
.dropdown-toggle.show:focus {
185-
color: $orange !important;
186-
}
154+
color: $orange !important;
155+
}

0 commit comments

Comments
 (0)