Skip to content

Commit 9e49a04

Browse files
committed
Use correct default color for new border config
Our default theme use default bootstrap variable and is not a real theme like other bootswatch themes. So be sure to use the default value when we do use variables before defaults bootstrap layer applies This way we are explicit in the color we are mixing. Related to #11828
1 parent 8b19be9 commit 9e49a04

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/resources/formats/html/bootstrap/_bootstrap-variables.scss

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,12 @@ $link-weight: $font-weight-base !default;
272272
$link-decoration: null !default;
273273

274274
// border colors
275+
/// if a theme does not provide body-color or body-bg
276+
/// defaults to boostrap own default value for theses variables (in _variables.scss)
275277
$border-color: mix(
276-
if(variable-exists(body-color), $body-color, #fff),
277-
$body-contrast-bg,
278-
30%
278+
if(variable-exists(body-color), $body-color, $gray-900),
279+
if(variable-exists(body-bg), $body-bg, $white),
280+
15%
279281
) !default;
282+
/// Make sure table border are the same as the border color (in case change in bootstrap default)
280283
$table-border-color: $border-color !default;

0 commit comments

Comments
 (0)