From a3d6e84ae74dbd80a3c1ddeee23968c53c225c74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Thu, 5 Jan 2023 09:22:07 +0100 Subject: [PATCH 1/2] Fix duplicate `--bs-emphasis-color` set value --- scss/_root.scss | 12 ++++-------- scss/_variables-dark.scss | 1 - scss/_variables.scss | 2 -- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/scss/_root.scss b/scss/_root.scss index 2bde6f7b6e40..7fe1585f4276 100644 --- 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); @@ -146,8 +144,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)}; @@ -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 c3200254b044..b37cdf196ec9 100644 --- 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 index c2201401578d..e672feb2ed3b 100644 --- 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; From 495d979238730a98ba1366fcd121c2967932cedb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2023 19:34:21 -0800 Subject: [PATCH 2/2] Restore body- prefix --- scss/_root.scss | 8 ++++---- scss/_variables-dark.scss | 2 +- scss/_variables.scss | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scss/_root.scss b/scss/_root.scss index 7fe1585f4276..64c73659dda7 100644 --- 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: #{$emphasis-color}; - --#{$prefix}emphasis-color-rgb: #{to-rgb($emphasis-color)}; + --#{$prefix}emphasis-color: #{$body-emphasis-color}; + --#{$prefix}emphasis-color-rgb: #{to-rgb($body-emphasis-color)}; --#{$prefix}secondary-color: #{$body-secondary-color}; --#{$prefix}secondary-color-rgb: #{to-rgb($body-secondary-color)}; @@ -144,8 +144,8 @@ --#{$prefix}body-bg: #{$body-bg-dark}; --#{$prefix}body-bg-rgb: #{to-rgb($body-bg-dark)}; - --#{$prefix}emphasis-color: #{$emphasis-color-dark}; - --#{$prefix}emphasis-color-rgb: #{to-rgb($emphasis-color-dark)}; + --#{$prefix}emphasis-color: #{$body-emphasis-color-dark}; + --#{$prefix}emphasis-color-rgb: #{to-rgb($body-emphasis-color-dark)}; --#{$prefix}secondary-color: #{$body-secondary-color-dark}; --#{$prefix}secondary-color-rgb: #{to-rgb($body-secondary-color-dark)}; diff --git a/scss/_variables-dark.scss b/scss/_variables-dark.scss index b37cdf196ec9..c3b4640a4e4b 100644 --- a/scss/_variables-dark.scss +++ b/scss/_variables-dark.scss @@ -40,7 +40,7 @@ $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 e672feb2ed3b..fbf9573f6ce0 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -438,7 +438,7 @@ $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 //