diff options
Diffstat (limited to 'assets/stylesheets/bootstrap/_variables.scss')
| -rw-r--r-- | assets/stylesheets/bootstrap/_variables.scss | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index 3750fa2..9262ca4 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -409,23 +409,33 @@ $body-text-align: null !default; // // Extends the default `$theme-colors` maps to help create our utilities. +// Come v6, we'll de-dupe these variables. Until then, for backward compatibility, we keep them to reassign. // scss-docs-start utilities-colors -$utilities-colors: map-merge( - $theme-colors-rgb, +$utilities-colors: $theme-colors-rgb !default; +// scss-docs-end utilities-colors + +// scss-docs-start utilities-text-colors +$utilities-text: map-merge( + $utilities-colors, ( "black": to-rgb($black), "white": to-rgb($white), - "body": to-rgb($body-color) + "body": to-rgb($body-color) ) ) !default; -// scss-docs-end utilities-colors - -// scss-docs-start utilities-text-colors -$utilities-text-colors: map-loop($utilities-colors, rgba-css-var, "$key", "text") !default; +$utilities-text-colors: map-loop($utilities-text, rgba-css-var, "$key", "text") !default; // scss-docs-end utilities-text-colors // scss-docs-start utilities-bg-colors -$utilities-bg-colors: map-loop($utilities-colors, rgba-css-var, "$key", "bg") !default; +$utilities-bg: map-merge( + $utilities-colors, + ( + "black": to-rgb($black), + "white": to-rgb($white), + "body": to-rgb($body-bg) + ) +) !default; +$utilities-bg-colors: map-loop($utilities-bg, rgba-css-var, "$key", "bg") !default; // scss-docs-end utilities-bg-colors // Links @@ -1157,7 +1167,7 @@ $dropdown-divider-margin-y: $spacer * .5 !default; $dropdown-box-shadow: $box-shadow !default; $dropdown-link-color: $gray-900 !default; -$dropdown-link-hover-color: shade-color($gray-900, 10%) !default; +$dropdown-link-hover-color: shade-color($dropdown-link-color, 10%) !default; $dropdown-link-hover-bg: $gray-200 !default; $dropdown-link-active-color: $component-active-color !default; |