Skip to content

Commit df03627

Browse files
Auto-update Bootstrap from twbs/bootstrap@v6-dev (0cc23c8636de5749ac3cc7a775ad8e75c1975b47)
1 parent a1b780c commit df03627

2 files changed

Lines changed: 23 additions & 1 deletion

File tree

‎assets/stylesheets/bootstrap/_theme.scss‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,26 @@
6868
@return $result;
6969
}
7070

71+
// Set each --theme-* token to `initial` so descendants drop inherited theme colors.
72+
// Use `initial`, not `unset`. `unset` inherits from the parent again.
73+
// scss-docs-start generate-theme-reset
74+
@mixin generate-theme-reset() {
75+
.theme-reset {
76+
$keys: ();
77+
78+
@each $color-map in map.values($theme-colors) {
79+
@each $key in map.keys($color-map) {
80+
$keys: map.merge($keys, ($key: true));
81+
}
82+
}
83+
84+
@each $key in map.keys($keys) {
85+
--theme-#{$key}: initial;
86+
}
87+
}
88+
}
89+
// scss-docs-end generate-theme-reset
90+
7191
// Generate theme classes dynamically based on the keys in each theme color map
7292
@mixin generate-theme-classes() {
7393
@each $color-name, $color-map in $theme-colors {
@@ -77,6 +97,8 @@
7797
}
7898
}
7999
}
100+
101+
@include generate-theme-reset();
80102
}
81103

82104
// Theme maps use the `defaults()` pattern so `@use ... with (...)` merges custom

‎lib/bootstrap/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
module Bootstrap
44
VERSION = '6.0.0.alpha1'
5-
BOOTSTRAP_SHA = '9192d3411e3fc5c8833372b7d15a0085d2347031'
5+
BOOTSTRAP_SHA = '0cc23c8636de5749ac3cc7a775ad8e75c1975b47'
66
end

0 commit comments

Comments
 (0)