diff options
| author | XhmikosR <[email protected]> | 2020-12-15 11:24:13 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2020-12-15 11:24:13 +0200 |
| commit | ea9c7e735b2593229a504d53e986eb38cacc7066 (patch) | |
| tree | 5a872f8f959232592bb0aa34cc5b4dbb7ecbc364 /scss | |
| parent | e5933330e1e3c363d240035d67f97ec094577d91 (diff) | |
| parent | cc3a5cf79a5afd73a97dce380f93e0d192a34456 (diff) | |
| download | bootstrap-rohit/main/modal-with-sticky.tar.xz bootstrap-rohit/main/modal-with-sticky.zip | |
Merge remote-tracking branch 'remotes/origin/main' into rohit/main/modal-with-stickyrohit/main/modal-with-sticky
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_pagination.scss | 4 | ||||
| -rw-r--r-- | scss/_variables.scss | 3 | ||||
| -rw-r--r-- | scss/helpers/_visually-hidden.scss | 2 | ||||
| -rw-r--r-- | scss/mixins/_visually-hidden.scss | 5 |
4 files changed, 9 insertions, 5 deletions
diff --git a/scss/_pagination.scss b/scss/_pagination.scss index 04bf82536..9c466662e 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -56,9 +56,9 @@ @include pagination-size($pagination-padding-y, $pagination-padding-x, null, $pagination-border-radius); .pagination-lg { - @include pagination-size($pagination-padding-y-lg, $pagination-padding-x-lg, $font-size-lg, $border-radius-lg); + @include pagination-size($pagination-padding-y-lg, $pagination-padding-x-lg, $font-size-lg, $pagination-border-radius-lg); } .pagination-sm { - @include pagination-size($pagination-padding-y-sm, $pagination-padding-x-sm, $font-size-sm, $border-radius-sm); + @include pagination-size($pagination-padding-y-sm, $pagination-padding-x-sm, $font-size-sm, $pagination-border-radius-sm); } diff --git a/scss/_variables.scss b/scss/_variables.scss index d9acaca98..5af668659 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -991,6 +991,9 @@ $pagination-disabled-border-color: $gray-300 !default; $pagination-transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default; +$pagination-border-radius-sm: $border-radius-sm !default; +$pagination-border-radius-lg: $border-radius-lg !default; + // Cards $card-spacer-y: $spacer !default; diff --git a/scss/helpers/_visually-hidden.scss b/scss/helpers/_visually-hidden.scss index 0a843d383..4760ff03d 100644 --- a/scss/helpers/_visually-hidden.scss +++ b/scss/helpers/_visually-hidden.scss @@ -3,6 +3,6 @@ // .visually-hidden, -.visually-hidden-focusable:not(:focus) { +.visually-hidden-focusable:not(:focus):not(:focus-within) { @include visually-hidden(); } diff --git a/scss/mixins/_visually-hidden.scss b/scss/mixins/_visually-hidden.scss index d980696c8..ed7bc9c13 100644 --- a/scss/mixins/_visually-hidden.scss +++ b/scss/mixins/_visually-hidden.scss @@ -17,12 +17,13 @@ border: 0 !important; } -// Use to only display content when it's focused. +// Use to only display content when it's focused, or one of its child elements is focused +// (i.e. when focus is within the element/container that the class was applied to) // // Useful for "Skip to main content" links; see https://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1 @mixin visually-hidden-focusable() { - &:not(:focus) { + &:not(:focus):not(:focus-within) { @include visually-hidden(); } } |