Fix duplicate --bs-emphasis-color set value

twbs · Jan 5, 2023 · 3ee653e · 3ee653e
1 parent 8a35408
commit 3ee653e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/scss/_root.scss b/scss/_root.scss
@@ -58,8 +58,8 @@
   --#{$prefix}body-line-height: #{$line-height-base};
   --#{$prefix}body-color: #{$body-color};
 
-  --#{$prefix}emphasis-color: #{$body-emphasis-color};
-  --#{$prefix}emphasis-color-rgb: #{to-rgb($body-emphasis-color)};
+  --#{$prefix}emphasis-color: #{$emphasis-color};
+  --#{$prefix}emphasis-color-rgb: #{to-rgb($emphasis-color)};
 
   --#{$prefix}secondary-color: #{$body-secondary-color};
   --#{$prefix}secondary-color-rgb: #{to-rgb($body-secondary-color)};
@@ -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);
@@ -148,8 +146,8 @@
     --#{$prefix}body-bg: #{$body-bg-dark};
     --#{$prefix}body-bg-rgb: #{to-rgb($body-bg-dark)};
 
-    --#{$prefix}emphasis-color: #{$body-emphasis-color-dark};
-    --#{$prefix}emphasis-color-rgb: #{to-rgb($body-emphasis-color-dark)};
+    --#{$prefix}emphasis-color: #{$emphasis-color-dark};
+    --#{$prefix}emphasis-color-rgb: #{to-rgb($emphasis-color-dark)};
 
     --#{$prefix}secondary-color: #{$body-secondary-color-dark};
     --#{$prefix}secondary-color-rgb: #{to-rgb($body-secondary-color-dark)};
@@ -161,8 +159,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
@@ -36,7 +36,6 @@ $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;

diff --git a/scss/_variables.scss b/scss/_variables.scss
@@ -432,8 +432,6 @@ $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;