Fix duplicate `--bs-emphasis-color` set value (#37809)

* Fix duplicate `--bs-emphasis-color` set value

* Restore body- prefix

Co-authored-by: Mark Otto <markdotto@gmail.com>

diff --git a/scss/_root.scss b/scss/_root.scss
index 2bde6f7b6e403e2a5e21105736d347ac0d9959f8..64c73659dda7d46c54ad6345a70e4dc48d405f74 100644 (file)
--- 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 c3200254b044632262f706dd01b6cb546ee76b17..c3b4640a4e4b42754e97d1cb459a18c27739337c 100644 (file)
--- 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 c2201401578de9b53748546c1761e14e9cc2a20f..fbf9573f6ce0e42b8897476d9d67ac5f11d7a35d 100644 (file)
--- 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
 //