diff options
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_buttons.scss | 1 | ||||
| -rw-r--r-- | scss/_tables.scss | 12 | ||||
| -rw-r--r-- | scss/_variables.scss | 6 | ||||
| -rw-r--r-- | scss/bootstrap-grid.scss | 4 | ||||
| -rw-r--r-- | scss/bootstrap-reboot.scss | 6 | ||||
| -rw-r--r-- | scss/bootstrap-utilities.scss | 2 | ||||
| -rw-r--r-- | scss/bootstrap.scss | 2 | ||||
| -rw-r--r-- | scss/forms/_form-select.scss | 2 | ||||
| -rw-r--r-- | scss/mixins/_visually-hidden.scss | 2 |
9 files changed, 23 insertions, 14 deletions
diff --git a/scss/_buttons.scss b/scss/_buttons.scss index ee4287c92..fc72cde4d 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -4,6 +4,7 @@ .btn { display: inline-block; + align-self: center; font-family: $btn-font-family; font-weight: $btn-font-weight; line-height: $btn-line-height; diff --git a/scss/_tables.scss b/scss/_tables.scss index 92556ba05..e10e4c4e4 100644 --- a/scss/_tables.scss +++ b/scss/_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/scss/_variables.scss b/scss/_variables.scss index 1700f9941..3994f1897 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -972,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; @@ -982,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 @@ -1167,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; diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss index 2c68fbbf7..bef4ecaec 100644 --- a/scss/bootstrap-grid.scss +++ b/scss/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 "vendor/rfs"; +@import "root"; + @import "containers"; @import "grid"; diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss index 0c4bbe589..f31cbafaf 100644 --- a/scss/bootstrap-reboot.scss +++ b/scss/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 "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/scss/bootstrap-utilities.scss b/scss/bootstrap-utilities.scss index 297e825fa..6d80d3f3f 100644 --- a/scss/bootstrap-utilities.scss +++ b/scss/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) diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index e42b4b457..c9c9af234 100644 --- a/scss/bootstrap.scss +++ b/scss/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/scss/forms/_form-select.scss b/scss/forms/_form-select.scss index 4506a979a..153ff6cd5 100644 --- a/scss/forms/_form-select.scss +++ b/scss/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/scss/mixins/_visually-hidden.scss b/scss/mixins/_visually-hidden.scss index ed7bc9c13..4fc7f49d6 100644 --- a/scss/mixins/_visually-hidden.scss +++ b/scss/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; |
