diff options
| author | Julien Déramond <[email protected]> | 2023-01-06 04:59:24 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-01-05 19:59:24 -0800 |
| commit | 702a3b6a61fab473de356fe3fe91edf2b8a3b6f7 (patch) | |
| tree | d7878b4b476705eaaec1e0978a302e7c71fa799f | |
| parent | d17d2abb26cc5e73b7592e3386d21000793b845d (diff) | |
| download | bootstrap-702a3b6a61fab473de356fe3fe91edf2b8a3b6f7.tar.xz bootstrap-702a3b6a61fab473de356fe3fe91edf2b8a3b6f7.zip | |
Fix duplicate `--bs-emphasis-color` set value (#37809)
* Fix duplicate `--bs-emphasis-color` set value
* Restore body- prefix
Co-authored-by: Mark Otto <[email protected]>
| -rw-r--r-- | scss/_root.scss | 4 | ||||
| -rw-r--r-- | scss/_variables-dark.scss | 3 | ||||
| -rw-r--r-- | scss/_variables.scss | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/scss/_root.scss b/scss/_root.scss index 2bde6f7b6..64c73659d 100644 --- a/scss/_root.scss +++ b/scss/_root.scss @@ -115,8 +115,6 @@ --#{$prefix}box-shadow-lg: #{$box-shadow-lg}; --#{$prefix}box-shadow-inset: #{$box-shadow-inset}; - --#{$prefix}emphasis-color: #{$emphasis-color}; - // scss-docs-start form-control-vars --#{$prefix}form-control-bg: var(--#{$prefix}body-bg); --#{$prefix}form-control-disabled-bg: var(--#{$prefix}secondary-bg); @@ -159,8 +157,6 @@ --#{$prefix}tertiary-bg: #{$body-tertiary-bg-dark}; --#{$prefix}tertiary-bg-rgb: #{to-rgb($body-tertiary-bg-dark)}; - --#{$prefix}emphasis-color: #{$emphasis-color-dark}; - --#{$prefix}primary-text: #{$primary-text-dark}; --#{$prefix}secondary-text: #{$secondary-text-dark}; --#{$prefix}success-text: #{$success-text-dark}; diff --git a/scss/_variables-dark.scss b/scss/_variables-dark.scss index c3200254b..c3b4640a4 100644 --- a/scss/_variables-dark.scss +++ b/scss/_variables-dark.scss @@ -36,12 +36,11 @@ $dark-border-subtle-dark: $gray-800 !default; $body-color-dark: $gray-500 !default; $body-bg-dark: $gray-900 !default; -$body-emphasis-color-dark: $gray-100 !default; $body-secondary-color-dark: rgba($body-color-dark, .75) !default; $body-secondary-bg-dark: $gray-800 !default; $body-tertiary-color-dark: rgba($body-color-dark, .5) !default; $body-tertiary-bg-dark: mix($gray-800, $gray-900, 50%) !default; -$emphasis-color-dark: $white !default; +$body-emphasis-color-dark: $white !default; $border-color-dark: $gray-700 !default; $border-color-translucent-dark: rgba($white, .15) !default; $headings-color-dark: null !default; diff --git a/scss/_variables.scss b/scss/_variables.scss index c22014015..fbf9573f6 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -432,15 +432,13 @@ $body-text-align: null !default; $body-color: $gray-900 !default; $body-bg: $white !default; -$body-emphasis-color: $black !default; - $body-secondary-color: rgba($body-color, .75) !default; $body-secondary-bg: $gray-200 !default; $body-tertiary-color: rgba($body-color, .5) !default; $body-tertiary-bg: $gray-100 !default; -$emphasis-color: $black !default; +$body-emphasis-color: $black !default; // Links // |