diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2021-11-05 15:46:31 +0300 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2021-11-05 15:46:31 +0300 |
commit | 9b7f652f18a43afde55ac3996f7ede6c95d86dc7 (patch) | |
tree | 982c69498d990448f9a1d161739fe10fa4d3f6c9 /assets/stylesheets | |
parent | 8180cf0f5e6c11cd2bbe31528fbce0243157dcc8 (diff) |
Update to v5.1.1v5.1.1
bundle exec rake 'update[v5.1.0]'
Diffstat (limited to 'assets/stylesheets')
-rw-r--r-- | assets/stylesheets/_bootstrap-grid.scss | 4 | ||||
-rw-r--r-- | assets/stylesheets/_bootstrap-reboot.scss | 6 | ||||
-rw-r--r-- | assets/stylesheets/_bootstrap.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_functions.scss | 10 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_reboot.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_root.scss | 3 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_variables.scss | 28 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/bootstrap-utilities.scss | 2 |
8 files changed, 37 insertions, 20 deletions
diff --git a/assets/stylesheets/_bootstrap-grid.scss b/assets/stylesheets/_bootstrap-grid.scss index 0d781c9..e46c40d 100644 --- a/assets/stylesheets/_bootstrap-grid.scss +++ b/assets/stylesheets/_bootstrap-grid.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Grid v5.1.0 (https://getbootstrap.com/) + * Bootstrap Grid v5.1.1 (https://getbootstrap.com/) * Copyright 2011-2021 The Bootstrap Authors * Copyright 2011-2021 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) @@ -18,6 +18,8 @@ $include-column-box-sizing: true !default; @import "bootstrap/vendor/rfs"; +@import "bootstrap/root"; + @import "bootstrap/containers"; @import "bootstrap/grid"; diff --git a/assets/stylesheets/_bootstrap-reboot.scss b/assets/stylesheets/_bootstrap-reboot.scss index 18179d9..d3a9b2c 100644 --- a/assets/stylesheets/_bootstrap-reboot.scss +++ b/assets/stylesheets/_bootstrap-reboot.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Reboot v5.1.0 (https://getbootstrap.com/) + * Bootstrap Reboot v5.1.1 (https://getbootstrap.com/) * Copyright 2011-2021 The Bootstrap Authors * Copyright 2011-2021 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) @@ -8,8 +8,6 @@ @import "bootstrap/functions"; @import "bootstrap/variables"; -// Prevent the usage of custom properties since we don't add them to `:root` in reboot -$font-family-base: $font-family-sans-serif; // stylelint-disable-line scss/dollar-variable-default -$font-family-code: $font-family-monospace; // stylelint-disable-line scss/dollar-variable-default @import "bootstrap/mixins"; +@import "bootstrap/root"; @import "bootstrap/reboot"; diff --git a/assets/stylesheets/_bootstrap.scss b/assets/stylesheets/_bootstrap.scss index f2d551b..478642a 100644 --- a/assets/stylesheets/_bootstrap.scss +++ b/assets/stylesheets/_bootstrap.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap v5.1.0 (https://getbootstrap.com/) + * Bootstrap v5.1.1 (https://getbootstrap.com/) * Copyright 2011-2021 The Bootstrap Authors * Copyright 2011-2021 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) diff --git a/assets/stylesheets/bootstrap/_functions.scss b/assets/stylesheets/bootstrap/_functions.scss index e003955..30539b3 100644 --- a/assets/stylesheets/bootstrap/_functions.scss +++ b/assets/stylesheets/bootstrap/_functions.scss @@ -37,11 +37,17 @@ @return red($value), green($value), blue($value); } +// stylelint-disable scss/dollar-variable-pattern @function rgba-css-var($identifier, $target) { - @return rgba(var(--#{$variable-prefix}#{$identifier}-rgb), var(--#{$variable-prefix}#{$target}-opacity)); + @if $identifier == "body" and $target == "bg" { + @return rgba(var(--#{$variable-prefix}#{$identifier}-bg-rgb), var(--#{$variable-prefix}#{$target}-opacity)); + } @if $identifier == "body" and $target == "text" { + @return rgba(var(--#{$variable-prefix}#{$identifier}-color-rgb), var(--#{$variable-prefix}#{$target}-opacity)); + } @else { + @return rgba(var(--#{$variable-prefix}#{$identifier}-rgb), var(--#{$variable-prefix}#{$target}-opacity)); + } } -// stylelint-disable scss/dollar-variable-pattern @function map-loop($map, $func, $args...) { $_map: (); diff --git a/assets/stylesheets/bootstrap/_reboot.scss b/assets/stylesheets/bootstrap/_reboot.scss index 80bfffb..79fedc6 100644 --- a/assets/stylesheets/bootstrap/_reboot.scss +++ b/assets/stylesheets/bootstrap/_reboot.scss @@ -27,7 +27,7 @@ :root { @if $font-size-root != null { - font-size: var(--#{$variable-prefix}-root-font-size); + font-size: var(--#{$variable-prefix}root-font-size); } @if $enable-smooth-scroll { diff --git a/assets/stylesheets/bootstrap/_root.scss b/assets/stylesheets/bootstrap/_root.scss index 189b2b3..5e138e9 100644 --- a/assets/stylesheets/bootstrap/_root.scss +++ b/assets/stylesheets/bootstrap/_root.scss @@ -23,7 +23,8 @@ --#{$variable-prefix}white-rgb: #{to-rgb($white)}; --#{$variable-prefix}black-rgb: #{to-rgb($black)}; - --#{$variable-prefix}body-rgb: #{to-rgb($body-color)}; + --#{$variable-prefix}body-color-rgb: #{to-rgb($body-color)}; + --#{$variable-prefix}body-bg-rgb: #{to-rgb($body-bg)}; // Fonts 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; diff --git a/assets/stylesheets/bootstrap/bootstrap-utilities.scss b/assets/stylesheets/bootstrap/bootstrap-utilities.scss index 297e825..6d80d3f 100644 --- a/assets/stylesheets/bootstrap/bootstrap-utilities.scss +++ b/assets/stylesheets/bootstrap/bootstrap-utilities.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Utilities v5.1.0 (https://getbootstrap.com/) + * Bootstrap Utilities v5.1.1 (https://getbootstrap.com/) * Copyright 2011-2021 The Bootstrap Authors * Copyright 2011-2021 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) |