From b5c2cf3545836f3e49d428b0131acaa1056a9784 Mon Sep 17 00:00:00 2001 From: crissdev Date: Wed, 28 Feb 2024 14:51:27 +0200 Subject: [PATCH] v5.3.3 --- README.md | 2 +- _accordion.scss | 22 +++++++++++----------- _buttons.scss | 9 +++++++++ _carousel.scss | 12 ++---------- _modal.scss | 1 - _offcanvas.scss | 5 +---- _tables.scss | 2 +- _variables.scss | 10 +++++++--- forms/_form-check.scss | 2 +- mixins/_banner.scss | 4 ++-- mixins/_forms.scss | 14 ++++++++++++-- mixins/_grid.scss | 2 +- package.json | 2 +- 13 files changed, 49 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 944c1ed..ba412ed 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ For simplicity, this project will use the same version numbers as Bootstrap. ## Changelog -https://github.com/twbs/bootstrap/releases/tag/v5.3.2 +https://github.com/twbs/bootstrap/releases/tag/v5.3.3 ## Copyright and license diff --git a/_accordion.scss b/_accordion.scss index 75588a5..17e5436 100644 --- a/_accordion.scss +++ b/_accordion.scss @@ -20,7 +20,6 @@ --#{$prefix}accordion-btn-icon-transform: #{$accordion-icon-transform}; --#{$prefix}accordion-btn-icon-transition: #{$accordion-icon-transition}; --#{$prefix}accordion-btn-active-icon: #{escape-svg($accordion-button-active-icon)}; - --#{$prefix}accordion-btn-focus-border-color: #{$accordion-button-focus-border-color}; --#{$prefix}accordion-btn-focus-box-shadow: #{$accordion-button-focus-box-shadow}; --#{$prefix}accordion-body-padding-x: #{$accordion-body-padding-x}; --#{$prefix}accordion-body-padding-y: #{$accordion-body-padding-y}; @@ -74,7 +73,6 @@ &:focus { z-index: 3; - border-color: var(--#{$prefix}accordion-btn-focus-border-color); outline: 0; box-shadow: var(--#{$prefix}accordion-btn-focus-box-shadow); } @@ -92,7 +90,7 @@ &:first-of-type { @include border-top-radius(var(--#{$prefix}accordion-border-radius)); - .accordion-button { + > .accordion-header .accordion-button { @include border-top-radius(var(--#{$prefix}accordion-inner-border-radius)); } } @@ -105,13 +103,13 @@ &:last-of-type { @include border-bottom-radius(var(--#{$prefix}accordion-border-radius)); - .accordion-button { + > .accordion-header .accordion-button { &.collapsed { @include border-bottom-radius(var(--#{$prefix}accordion-inner-border-radius)); } } - .accordion-collapse { + > .accordion-collapse { @include border-bottom-radius(var(--#{$prefix}accordion-border-radius)); } } @@ -127,11 +125,7 @@ // Remove borders and border-radius to keep accordion items edge-to-edge. .accordion-flush { - .accordion-collapse { - border-width: 0; - } - - .accordion-item { + > .accordion-item { border-right: 0; border-left: 0; @include border-radius(0); @@ -139,12 +133,18 @@ &:first-child { border-top: 0; } &:last-child { border-bottom: 0; } - .accordion-button { + // stylelint-disable selector-max-class + > .accordion-header .accordion-button { &, &.collapsed { @include border-radius(0); } } + // stylelint-enable selector-max-class + + > .accordion-collapse { + @include border-radius(0); + } } } diff --git a/_buttons.scss b/_buttons.scss index e14a184..caa4518 100644 --- a/_buttons.scss +++ b/_buttons.scss @@ -100,6 +100,15 @@ } } + .btn-check:checked:focus-visible + & { + // Avoid using mixin so we can pass custom focus shadow properly + @if $enable-shadows { + box-shadow: var(--#{$prefix}btn-active-shadow), var(--#{$prefix}btn-focus-box-shadow); + } @else { + box-shadow: var(--#{$prefix}btn-focus-box-shadow); + } + } + &:disabled, &.disabled, fieldset:disabled & { diff --git a/_carousel.scss b/_carousel.scss index 0ac8f87..3a13522 100644 --- a/_carousel.scss +++ b/_carousel.scss @@ -132,19 +132,11 @@ background-size: 100% 100%; } -/* rtl:options: { - "autoRename": true, - "stringMap":[ { - "name" : "prev-next", - "search" : "prev", - "replace" : "next" - } ] -} */ .carousel-control-prev-icon { - background-image: escape-svg($carousel-control-prev-icon-bg); + background-image: escape-svg($carousel-control-prev-icon-bg) #{"/*rtl:" + escape-svg($carousel-control-next-icon-bg) + "*/"}; } .carousel-control-next-icon { - background-image: escape-svg($carousel-control-next-icon-bg); + background-image: escape-svg($carousel-control-next-icon-bg) #{"/*rtl:" + escape-svg($carousel-control-prev-icon-bg) + "*/"}; } // Optional indicator pips/controls diff --git a/_modal.scss b/_modal.scss index 5f1429f..494db94 100644 --- a/_modal.scss +++ b/_modal.scss @@ -126,7 +126,6 @@ display: flex; flex-shrink: 0; align-items: center; - justify-content: space-between; // Put modal header elements (title and dismiss) on opposite ends padding: var(--#{$prefix}modal-header-padding); border-bottom: var(--#{$prefix}modal-header-border-width) solid var(--#{$prefix}modal-header-border-color); @include border-top-radius(var(--#{$prefix}modal-inner-border-radius)); diff --git a/_offcanvas.scss b/_offcanvas.scss index 04e3ce6..eb2c97a 100644 --- a/_offcanvas.scss +++ b/_offcanvas.scss @@ -123,14 +123,11 @@ .offcanvas-header { display: flex; align-items: center; - justify-content: space-between; padding: var(--#{$prefix}offcanvas-padding-y) var(--#{$prefix}offcanvas-padding-x); .btn-close { padding: calc(var(--#{$prefix}offcanvas-padding-y) * .5) calc(var(--#{$prefix}offcanvas-padding-x) * .5); - margin-top: calc(-.5 * var(--#{$prefix}offcanvas-padding-y)); - margin-right: calc(-.5 * var(--#{$prefix}offcanvas-padding-x)); - margin-bottom: calc(-.5 * var(--#{$prefix}offcanvas-padding-y)); + margin: calc(-.5 * var(--#{$prefix}offcanvas-padding-y)) calc(-.5 * var(--#{$prefix}offcanvas-padding-x)) calc(-.5 * var(--#{$prefix}offcanvas-padding-y)) auto; } } diff --git a/_tables.scss b/_tables.scss index ebfc00a..276521a 100644 --- a/_tables.scss +++ b/_tables.scss @@ -79,7 +79,7 @@ // // When borders are added on all sides of the cells, the corners can render odd when // these borders do not have the same color or if they are semi-transparent. -// Therefor we add top and border bottoms to the `tr`s and left and right borders +// Therefore we add top and border bottoms to the `tr`s and left and right borders // to the `td`s or `th`s .table-bordered { diff --git a/_variables.scss b/_variables.scss index 5429c01..0653139 100644 --- a/_variables.scss +++ b/_variables.scss @@ -1383,7 +1383,9 @@ $accordion-transition: $btn-transition, border-radius .15s ea $accordion-button-active-bg: var(--#{$prefix}primary-bg-subtle) !default; $accordion-button-active-color: var(--#{$prefix}primary-text-emphasis) !default; -$accordion-button-focus-border-color: $input-focus-border-color !default; +// fusv-disable +$accordion-button-focus-border-color: $input-focus-border-color !default; // Deprecated in v5.3.3 +// fusv-enable $accordion-button-focus-box-shadow: $btn-focus-box-shadow !default; $accordion-icon-width: 1.25rem !default; @@ -1392,8 +1394,8 @@ $accordion-icon-active-color: $primary-text-emphasis !default; $accordion-icon-transition: transform .2s ease-in-out !default; $accordion-icon-transform: rotate(-180deg) !default; -$accordion-button-icon: url("data:image/svg+xml,") !default; -$accordion-button-active-icon: url("data:image/svg+xml,") !default; +$accordion-button-icon: url("data:image/svg+xml,") !default; +$accordion-button-active-icon: url("data:image/svg+xml,") !default; // scss-docs-end accordion-variables // Tooltips @@ -1745,3 +1747,5 @@ $kbd-bg: var(--#{$prefix}body-color) !default; $nested-kbd-font-weight: null !default; // Deprecated in v5.2.0, removing in v6 $pre-color: null !default; + +@import "variables-dark"; // TODO: can be removed safely in v6, only here to avoid breaking changes in v5.3 diff --git a/forms/_form-check.scss b/forms/_form-check.scss index d3a8fe6..8a1b639 100644 --- a/forms/_form-check.scss +++ b/forms/_form-check.scss @@ -131,7 +131,7 @@ margin-left: $form-switch-padding-start * -1; background-image: var(--#{$prefix}form-switch-bg); background-position: left center; - @include border-radius($form-switch-border-radius); + @include border-radius($form-switch-border-radius, 0); @include transition($form-switch-transition); &:focus { diff --git a/mixins/_banner.scss b/mixins/_banner.scss index ee2c584..20c2fd1 100644 --- a/mixins/_banner.scss +++ b/mixins/_banner.scss @@ -1,7 +1,7 @@ @mixin bsBanner($file) { /*! - * Bootstrap #{$file} v5.3.2 (https://getbootstrap.com/) - * Copyright 2011-2023 The Bootstrap Authors + * Bootstrap #{$file} v5.3.3 (https://getbootstrap.com/) + * Copyright 2011-2024 The Bootstrap Authors * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ } diff --git a/mixins/_forms.scss b/mixins/_forms.scss index d47b1e4..00b4764 100644 --- a/mixins/_forms.scss +++ b/mixins/_forms.scss @@ -69,7 +69,12 @@ &:focus { border-color: $border-color; - box-shadow: $focus-box-shadow; + @if $enable-shadows { + @include box-shadow($input-box-shadow, $focus-box-shadow); + } @else { + // Avoid using mixin so we can pass custom focus shadow properly + box-shadow: $focus-box-shadow; + } } } } @@ -100,7 +105,12 @@ &:focus { border-color: $border-color; - box-shadow: $focus-box-shadow; + @if $enable-shadows { + @include box-shadow($form-select-box-shadow, $focus-box-shadow); + } @else { + // Avoid using mixin so we can pass custom focus shadow properly + box-shadow: $focus-box-shadow; + } } } } diff --git a/mixins/_grid.scss b/mixins/_grid.scss index 99b1e7d..ea30739 100644 --- a/mixins/_grid.scss +++ b/mixins/_grid.scss @@ -138,7 +138,7 @@ } } - // Start with `1` because `0` is and invalid value. + // Start with `1` because `0` is an invalid value. // Ends with `$columns - 1` because offsetting by the width of an entire row isn't possible. @for $i from 1 through ($columns - 1) { .g-start#{$infix}-#{$i} { diff --git a/package.json b/package.json index 004dd45..eaae175 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-scss", - "version": "5.3.2", + "version": "5.3.3", "description": "Bootstrap's SCSS files (only)", "main": "bootstrap.scss", "repository": {