Skip to content

Commit 288559a

Browse files
committed
use CSS variables for dark mode dropdown styling
1 parent c851277 commit 288559a

3 files changed

Lines changed: 40 additions & 34 deletions

File tree

bases/rsptx/interactives/ptxrs-bootstrap.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
--bodyFont: var(--body-text-color, #000000);
1313
--tooltip: #ffffff;
1414
--grayToWhite: #333333;
15+
--dropdownBg: #ffffff;
16+
--dropdownHoverBg: #f5f5f5;
1517
--navbar: #f8f8f8;
1618
--navbarFont: #707070;
1719
--navbarFontHover: #000000;
@@ -76,6 +78,8 @@
7678
--bodyFont: #99aab5;
7779
--tooltip: #000000;
7880
--grayToWhite: #ffffff;
81+
--dropdownBg: #1a1a1a;
82+
--dropdownHoverBg: #333333;
7983
--navbar: #3d3d3d;
8084
--navbarFont: #ffffff;
8185
--navbarFontHover: #d6d6d6;

bases/rsptx/interactives/runestone/common/css/runestone-custom-sphinx-bootstrap.css

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ Needed??? */
5959
--bodyFont: #99aab5;
6060
--tooltip: #000000;
6161
--grayToWhite: #ffffff;
62+
--dropdownBg: #1a1a1a;
63+
--dropdownHoverBg: #333333;
6264
--navbar: #3d3d3d;
6365
--navbarFont: #ffffff;
6466
--navbarFontHover: #d6d6d6;
@@ -388,34 +390,26 @@ div.container {
388390
}
389391

390392
.dropdown-menu > li > label:hover, .dropdown-menu > li > label:focus {
391-
color: #262626;
393+
color: var(--grayToWhite);
392394
text-decoration: none;
393-
background-color: #f5f5f5;
395+
background-color: var(--dropdownHoverBg, #f5f5f5);
394396
}
395397

396-
/*Dark mode-force dropdown menus to black background with white text */
397-
[data-theme="dark"] .dropdown-menu {
398-
background-color: #000000;
399-
color: #ffffff;
400-
}
401398

402-
[data-theme="dark"] .dropdown-menu > li > a,
403-
[data-theme="dark"] .dropdown-menu > li > span,
404-
[data-theme="dark"] .dropdown-menu > li > div,
405-
[data-theme="dark"] .dropdown-menu > li > label {
406-
color: #ffffff;
399+
.dropdown-menu {
400+
background-color: var(--dropdownBg, #ffffff);
407401
}
408402

409-
[data-theme="dark"] .dropdown-menu > li > a:hover,
410-
[data-theme="dark"] .dropdown-menu > li > a:focus,
411-
[data-theme="dark"] .dropdown-menu > li > label:hover,
412-
[data-theme="dark"] .dropdown-menu > li > label:focus {
413-
color: #ffffff;
414-
background-color: #333333;
403+
.dropdown-menu > li > a {
404+
color: var(--grayToWhite);
415405
}
416406

417-
.dropdown-menu > li > a {
407+
.dropdown-menu > li > a:hover,
408+
.dropdown-menu > li > a:focus,
409+
.dropdown-menu > li > label:hover,
410+
.dropdown-menu > li > label:focus {
418411
color: var(--grayToWhite);
412+
background-color: var(--dropdownHoverBg, #f5f5f5);
419413
}
420414

421415
.loggedinuser {

components/rsptx/templates/staticAssets/css/runestone-custom-sphinx-bootstrap.css

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -140,25 +140,33 @@ div.section {
140140
white-space: nowrap;
141141
}
142142

143-
/*Dark mode- force dropdown menus to black background with white text */
144-
[data-theme="dark"] .dropdown-menu {
145-
background-color: #000000 !important;
146-
color: #ffffff !important;
143+
:root {
144+
--dropdownBg: #ffffff;
145+
--dropdownHoverBg: #f5f5f5;
147146
}
148147

149-
[data-theme="dark"] .dropdown-menu > li > a,
150-
[data-theme="dark"] .dropdown-menu > li > span,
151-
[data-theme="dark"] .dropdown-menu > li > div,
152-
[data-theme="dark"] .dropdown-menu > li > label {
153-
color: #ffffff !important;
148+
[data-theme="dark"] {
149+
--dropdownBg: #1a1a1a;
150+
--dropdownHoverBg: #333333;
154151
}
155152

156-
[data-theme="dark"] .dropdown-menu > li > a:hover,
157-
[data-theme="dark"] .dropdown-menu > li > a:focus,
158-
[data-theme="dark"] .dropdown-menu > li > label:hover,
159-
[data-theme="dark"] .dropdown-menu > li > label:focus {
160-
color: #ffffff !important;
161-
background-color: #333333 !important;
153+
.dropdown-menu {
154+
background-color: var(--dropdownBg, #ffffff);
155+
}
156+
157+
.dropdown-menu > li > a,
158+
.dropdown-menu > li > span,
159+
.dropdown-menu > li > div,
160+
.dropdown-menu > li > label {
161+
color: var(--grayToWhite, #333);
162+
}
163+
164+
.dropdown-menu > li > a:hover,
165+
.dropdown-menu > li > a:focus,
166+
.dropdown-menu > li > label:hover,
167+
.dropdown-menu > li > label:focus {
168+
color: var(--grayToWhite, #333);
169+
background-color: var(--dropdownHoverBg, #f5f5f5);
162170
}
163171

164172
.loggedinuser {

0 commit comments

Comments
 (0)