Skip to content

Commit 60714e3

Browse files
julien-deramondmdo
andauthored
Add theme maps specific to dark mode (#37843)
* Add theme maps specific to dark mode * Fix CSS building * Fix other failing test Co-authored-by: Mark Otto <markdotto@gmail.com>
1 parent f23e203 commit 60714e3

File tree

4 files changed

+52
-26
lines changed

4 files changed

+52
-26
lines changed

scss/_maps.scss

+39
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,45 @@ $theme-colors-border-subtle: (
3939
"dark": $dark-border-subtle,
4040
) !default;
4141

42+
$theme-colors-text-dark: null !default;
43+
$theme-colors-bg-subtle-dark: null !default;
44+
$theme-colors-border-subtle-dark: null !default;
45+
46+
@if $enable-dark-mode {
47+
$theme-colors-text-dark: (
48+
"primary": $primary-text-dark,
49+
"secondary": $secondary-text-dark,
50+
"success": $success-text-dark,
51+
"info": $info-text-dark,
52+
"warning": $warning-text-dark,
53+
"danger": $danger-text-dark,
54+
"light": $light-text-dark,
55+
"dark": $dark-text-dark,
56+
) !default;
57+
58+
$theme-colors-bg-subtle-dark: (
59+
"primary": $primary-bg-subtle-dark,
60+
"secondary": $secondary-bg-subtle-dark,
61+
"success": $success-bg-subtle-dark,
62+
"info": $info-bg-subtle-dark,
63+
"warning": $warning-bg-subtle-dark,
64+
"danger": $danger-bg-subtle-dark,
65+
"light": $light-bg-subtle-dark,
66+
"dark": $dark-bg-subtle-dark,
67+
) !default;
68+
69+
$theme-colors-border-subtle-dark: (
70+
"primary": $primary-border-subtle-dark,
71+
"secondary": $secondary-border-subtle-dark,
72+
"success": $success-border-subtle-dark,
73+
"info": $info-border-subtle-dark,
74+
"warning": $warning-border-subtle-dark,
75+
"danger": $danger-border-subtle-dark,
76+
"light": $light-border-subtle-dark,
77+
"dark": $dark-border-subtle-dark,
78+
) !default;
79+
}
80+
4281
// Utilities maps
4382
//
4483
// Extends the default `$theme-colors` maps to help create our utilities.

scss/_root.scss

+11-26
Original file line numberDiff line numberDiff line change
@@ -153,32 +153,17 @@
153153
--#{$prefix}tertiary-bg: #{$body-tertiary-bg-dark};
154154
--#{$prefix}tertiary-bg-rgb: #{to-rgb($body-tertiary-bg-dark)};
155155

156-
--#{$prefix}primary-text: #{$primary-text-dark};
157-
--#{$prefix}secondary-text: #{$secondary-text-dark};
158-
--#{$prefix}success-text: #{$success-text-dark};
159-
--#{$prefix}info-text: #{$info-text-dark};
160-
--#{$prefix}warning-text: #{$warning-text-dark};
161-
--#{$prefix}danger-text: #{$danger-text-dark};
162-
--#{$prefix}light-text: #{$light-text-dark};
163-
--#{$prefix}dark-text: #{$dark-text-dark};
164-
165-
--#{$prefix}primary-bg-subtle: #{$primary-bg-subtle-dark};
166-
--#{$prefix}secondary-bg-subtle: #{$secondary-bg-subtle-dark};
167-
--#{$prefix}success-bg-subtle: #{$success-bg-subtle-dark};
168-
--#{$prefix}info-bg-subtle: #{$info-bg-subtle-dark};
169-
--#{$prefix}warning-bg-subtle: #{$warning-bg-subtle-dark};
170-
--#{$prefix}danger-bg-subtle: #{$danger-bg-subtle-dark};
171-
--#{$prefix}light-bg-subtle: #{$light-bg-subtle-dark};
172-
--#{$prefix}dark-bg-subtle: #{$dark-bg-subtle-dark};
173-
174-
--#{$prefix}primary-border-subtle: #{$primary-border-subtle-dark};
175-
--#{$prefix}secondary-border-subtle: #{$secondary-border-subtle-dark};
176-
--#{$prefix}success-border-subtle: #{$success-border-subtle-dark};
177-
--#{$prefix}info-border-subtle: #{$info-border-subtle-dark};
178-
--#{$prefix}warning-border-subtle: #{$warning-border-subtle-dark};
179-
--#{$prefix}danger-border-subtle: #{$danger-border-subtle-dark};
180-
--#{$prefix}light-border-subtle: #{$light-border-subtle-dark};
181-
--#{$prefix}dark-border-subtle: #{$dark-border-subtle-dark};
156+
@each $color, $value in $theme-colors-text-dark {
157+
--#{$prefix}#{$color}-text: #{$value};
158+
}
159+
160+
@each $color, $value in $theme-colors-bg-subtle-dark {
161+
--#{$prefix}#{$color}-bg-subtle: #{$value};
162+
}
163+
164+
@each $color, $value in $theme-colors-border-subtle-dark {
165+
--#{$prefix}#{$color}-border-subtle: #{$value};
166+
}
182167

183168
@if $headings-color-dark != null {
184169
--#{$prefix}heading-color: #{$headings-color-dark};

scss/bootstrap-grid.scss

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ $include-column-box-sizing: true !default;
55

66
@import "functions";
77
@import "variables";
8+
@import "variables-dark";
89
@import "maps";
910

1011
@import "mixins/lists";

scss/tests/utilities/_api.test.scss

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@import "../../functions";
22
@import "../../variables";
3+
@import "../../variables-dark";
34
@import "../../maps";
45
@import "../../mixins";
56

0 commit comments

Comments
 (0)