clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-21 10:37:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

* Restore body- prefix

Co-authored-by: Mark Otto <markdotto@gmail.com>
This commit is contained in:
Julien Déramond 2023-01-06 04:59:24 +01:00 committed by GitHub
parent d17d2abb26
commit 702a3b6a61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scss/_root.scss
View File

@ -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};

3
scss/_variables-dark.scss
View File

@ -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;

4
scss/_variables.scss
View File

@ -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
//