diff --git a/build/vendor/bootstrap/_functions.scss b/build/vendor/bootstrap/_functions.scss index e003955..30539b3 100644 --- a/build/vendor/bootstrap/_functions.scss +++ b/build/vendor/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/build/vendor/bootstrap/_reboot.scss b/build/vendor/bootstrap/_reboot.scss index 80bfffb..79fedc6 100644 --- a/build/vendor/bootstrap/_reboot.scss +++ b/build/vendor/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/build/vendor/bootstrap/_root.scss b/build/vendor/bootstrap/_root.scss index 189b2b3..5e138e9 100644 --- a/build/vendor/bootstrap/_root.scss +++ b/build/vendor/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/build/vendor/bootstrap/_tables.scss b/build/vendor/bootstrap/_tables.scss index 92556ba..e10e4c4 100644 --- a/build/vendor/bootstrap/_tables.scss +++ b/build/vendor/bootstrap/_tables.scss @@ -39,8 +39,8 @@ } // Highlight border color between thead, tbody and tfoot. - > :not(:last-child) > :last-child > * { - border-bottom-color: $table-group-separator-color; + > :not(:first-child) { + border-top: (2 * $table-border-width) solid $table-group-separator-color; } } @@ -91,6 +91,10 @@ > :not(caption) > * > * { border-bottom-width: 0; } + + > :not(:first-child) { + border-top-width: 0; + } } // Zebra-striping @@ -98,7 +102,7 @@ // Default zebra-stripe styles (alternating gray and transparent backgrounds) .table-striped { - > tbody > tr:nth-of-type(#{$table-striped-order}) { + > tbody > tr:nth-of-type(#{$table-striped-order}) > * { --#{$variable-prefix}table-accent-bg: var(--#{$variable-prefix}table-striped-bg); color: var(--#{$variable-prefix}table-striped-color); } @@ -118,7 +122,7 @@ // Placed here since it has to come after the potential zebra striping .table-hover { - > tbody > tr:hover { + > tbody > tr:hover > * { --#{$variable-prefix}table-accent-bg: var(--#{$variable-prefix}table-hover-bg); color: var(--#{$variable-prefix}table-hover-color); } diff --git a/build/vendor/bootstrap/_variables.scss b/build/vendor/bootstrap/_variables.scss index 3750fa2..f33b804 100644 --- a/build/vendor/bootstrap/_variables.scss +++ b/build/vendor/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 @@ -914,7 +924,7 @@ $form-check-inline-margin-end: 1rem !default; // scss-docs-end form-check-variables // scss-docs-start form-switch-variables -$form-switch-color: rgba(0, 0, 0, .25) !default; +$form-switch-color: rgba($black, .25) !default; $form-switch-width: 2em !default; $form-switch-padding-start: $form-switch-width + .5em !default; $form-switch-bg-image: url("data:image/svg+xml,") !default; @@ -962,7 +972,7 @@ $form-select-feedback-icon-size: $input-height-inner-half $input-height-i $form-select-border-width: $input-border-width !default; $form-select-border-color: $input-border-color !default; -$form-select-border-radius: $border-radius !default; +$form-select-border-radius: $input-border-radius !default; $form-select-box-shadow: $box-shadow-inset !default; $form-select-focus-border-color: $input-focus-border-color !default; @@ -972,10 +982,12 @@ $form-select-focus-box-shadow: 0 0 0 $form-select-focus-width $input-btn-focu $form-select-padding-y-sm: $input-padding-y-sm !default; $form-select-padding-x-sm: $input-padding-x-sm !default; $form-select-font-size-sm: $input-font-size-sm !default; +$form-select-border-radius-sm: $input-border-radius-sm !default; $form-select-padding-y-lg: $input-padding-y-lg !default; $form-select-padding-x-lg: $input-padding-x-lg !default; $form-select-font-size-lg: $input-font-size-lg !default; +$form-select-border-radius-lg: $input-border-radius-lg !default; $form-select-transition: $input-transition !default; // scss-docs-end form-select-variables @@ -1157,7 +1169,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; @@ -1362,14 +1374,14 @@ $toast-font-size: .875rem !default; $toast-color: null !default; $toast-background-color: rgba($white, .85) !default; $toast-border-width: 1px !default; -$toast-border-color: rgba(0, 0, 0, .1) !default; +$toast-border-color: rgba($black, .1) !default; $toast-border-radius: $border-radius !default; $toast-box-shadow: $box-shadow !default; $toast-spacing: $container-padding-x !default; $toast-header-color: $gray-600 !default; $toast-header-background-color: rgba($white, .85) !default; -$toast-header-border-color: rgba(0, 0, 0, .05) !default; +$toast-header-border-color: rgba($black, .05) !default; // scss-docs-end toast-variables diff --git a/build/vendor/bootstrap/bootstrap-grid.scss b/build/vendor/bootstrap/bootstrap-grid.scss index 2c68fbb..d4a37a0 100644 --- a/build/vendor/bootstrap/bootstrap-grid.scss +++ b/build/vendor/bootstrap/bootstrap-grid.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Grid v5.1.0 (https://getbootstrap.com/) + * Bootstrap Grid v5.1.3 (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 "vendor/rfs"; +@import "root"; + @import "containers"; @import "grid"; diff --git a/build/vendor/bootstrap/bootstrap-reboot.scss b/build/vendor/bootstrap/bootstrap-reboot.scss index 0c4bbe5..965332a 100644 --- a/build/vendor/bootstrap/bootstrap-reboot.scss +++ b/build/vendor/bootstrap/bootstrap-reboot.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Reboot v5.1.0 (https://getbootstrap.com/) + * Bootstrap Reboot v5.1.3 (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 "functions"; @import "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 "mixins"; +@import "root"; @import "reboot"; diff --git a/build/vendor/bootstrap/bootstrap-utilities.scss b/build/vendor/bootstrap/bootstrap-utilities.scss index 297e825..d4f981d 100644 --- a/build/vendor/bootstrap/bootstrap-utilities.scss +++ b/build/vendor/bootstrap/bootstrap-utilities.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Utilities v5.1.0 (https://getbootstrap.com/) + * Bootstrap Utilities v5.1.3 (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/build/vendor/bootstrap/bootstrap.scss b/build/vendor/bootstrap/bootstrap.scss index e42b4b4..0819eee 100644 --- a/build/vendor/bootstrap/bootstrap.scss +++ b/build/vendor/bootstrap/bootstrap.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap v5.1.0 (https://getbootstrap.com/) + * Bootstrap v5.1.3 (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/build/vendor/bootstrap/forms/_form-select.scss b/build/vendor/bootstrap/forms/_form-select.scss index 4506a97..153ff6c 100644 --- a/build/vendor/bootstrap/forms/_form-select.scss +++ b/build/vendor/bootstrap/forms/_form-select.scss @@ -60,6 +60,7 @@ padding-bottom: $form-select-padding-y-sm; padding-left: $form-select-padding-x-sm; @include font-size($form-select-font-size-sm); + @include border-radius($form-select-border-radius-sm); } .form-select-lg { @@ -67,4 +68,5 @@ padding-bottom: $form-select-padding-y-lg; padding-left: $form-select-padding-x-lg; @include font-size($form-select-font-size-lg); + @include border-radius($form-select-border-radius-lg); } diff --git a/build/vendor/bootstrap/mixins/_grid.scss b/build/vendor/bootstrap/mixins/_grid.scss index 59cc563..aea51ab 100644 --- a/build/vendor/bootstrap/mixins/_grid.scss +++ b/build/vendor/bootstrap/mixins/_grid.scss @@ -7,9 +7,10 @@ --#{$variable-prefix}gutter-y: 0; display: flex; flex-wrap: wrap; - margin-top: calc(var(--#{$variable-prefix}gutter-y) * -1); // stylelint-disable-line function-disallowed-list - margin-right: calc(var(--#{$variable-prefix}gutter-x) * -.5); // stylelint-disable-line function-disallowed-list - margin-left: calc(var(--#{$variable-prefix}gutter-x) * -.5); // stylelint-disable-line function-disallowed-list + // TODO: Revisit calc order after https://github.com/react-bootstrap/react-bootstrap/issues/6039 is fixed + margin-top: calc(-1 * var(--#{$variable-prefix}gutter-y)); // stylelint-disable-line function-disallowed-list + margin-right: calc(-.5 * var(--#{$variable-prefix}gutter-x)); // stylelint-disable-line function-disallowed-list + margin-left: calc(-.5 * var(--#{$variable-prefix}gutter-x)); // stylelint-disable-line function-disallowed-list } @mixin make-col-ready($gutter: $grid-gutter-width) { diff --git a/build/vendor/bootstrap/mixins/_visually-hidden.scss b/build/vendor/bootstrap/mixins/_visually-hidden.scss index ed7bc9c..4fc7f49 100644 --- a/build/vendor/bootstrap/mixins/_visually-hidden.scss +++ b/build/vendor/bootstrap/mixins/_visually-hidden.scss @@ -3,7 +3,7 @@ // Hide content visually while keeping it accessible to assistive technologies // // See: https://www.a11yproject.com/posts/2013-01-11-how-to-hide-content/ -// See: https://hugogiraudel.com/2016/10/13/css-hide-and-seek/ +// See: https://kittygiraudel.com/2016/10/13/css-hide-and-seek/ @mixin visually-hidden() { position: absolute !important;