diff options
| author | Louis-Maxime Piton <[email protected]> | 2023-01-06 20:46:03 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-01-06 11:46:03 -0800 |
| commit | 8265927fc1dc5fd18c13d04d623f00a77590e4e0 (patch) | |
| tree | b5e6c98b022b6da1cc848838459d21314b814c97 | |
| parent | 7399b130525374423e537f5f083d4e749607ed31 (diff) | |
| download | bootstrap-8265927fc1dc5fd18c13d04d623f00a77590e4e0.tar.xz bootstrap-8265927fc1dc5fd18c13d04d623f00a77590e4e0.zip | |
CSS: rename some variables to be consistent (#37804)
* Fix
* fix(review)
| -rw-r--r-- | scss/_root.scss | 3 | ||||
| -rw-r--r-- | scss/_utilities.scss | 10 | ||||
| -rw-r--r-- | scss/_variables.scss | 5 |
3 files changed, 11 insertions, 7 deletions
diff --git a/scss/_root.scss b/scss/_root.scss index 64c73659d..a37832222 100644 --- a/scss/_root.scss +++ b/scss/_root.scss @@ -106,7 +106,8 @@ --#{$prefix}border-radius-sm: #{$border-radius-sm}; --#{$prefix}border-radius-lg: #{$border-radius-lg}; --#{$prefix}border-radius-xl: #{$border-radius-xl}; - --#{$prefix}border-radius-2xl: #{$border-radius-2xl}; + --#{$prefix}border-radius-xxl: #{$border-radius-xxl}; + --#{$prefix}border-radius-2xl: var(--#{$prefix}border-radius-xxl); // Deprecated in v5.3.0 for consistency --#{$prefix}border-radius-pill: #{$border-radius-pill}; // scss-docs-end root-border-var diff --git a/scss/_utilities.scss b/scss/_utilities.scss index 10bd5c8bf..867c64e42 100644 --- a/scss/_utilities.scss +++ b/scss/_utilities.scss @@ -719,7 +719,7 @@ $utilities: map-merge( 2: var(--#{$prefix}border-radius), 3: var(--#{$prefix}border-radius-lg), 4: var(--#{$prefix}border-radius-xl), - 5: var(--#{$prefix}border-radius-2xl), + 5: var(--#{$prefix}border-radius-xxl), circle: 50%, pill: var(--#{$prefix}border-radius-pill) ) @@ -734,7 +734,7 @@ $utilities: map-merge( 2: var(--#{$prefix}border-radius), 3: var(--#{$prefix}border-radius-lg), 4: var(--#{$prefix}border-radius-xl), - 5: var(--#{$prefix}border-radius-2xl), + 5: var(--#{$prefix}border-radius-xxl), circle: 50%, pill: var(--#{$prefix}border-radius-pill) ) @@ -749,7 +749,7 @@ $utilities: map-merge( 2: var(--#{$prefix}border-radius), 3: var(--#{$prefix}border-radius-lg), 4: var(--#{$prefix}border-radius-xl), - 5: var(--#{$prefix}border-radius-2xl), + 5: var(--#{$prefix}border-radius-xxl), circle: 50%, pill: var(--#{$prefix}border-radius-pill) ) @@ -764,7 +764,7 @@ $utilities: map-merge( 2: var(--#{$prefix}border-radius), 3: var(--#{$prefix}border-radius-lg), 4: var(--#{$prefix}border-radius-xl), - 5: var(--#{$prefix}border-radius-2xl), + 5: var(--#{$prefix}border-radius-xxl), circle: 50%, pill: var(--#{$prefix}border-radius-pill) ) @@ -779,7 +779,7 @@ $utilities: map-merge( 2: var(--#{$prefix}border-radius), 3: var(--#{$prefix}border-radius-lg), 4: var(--#{$prefix}border-radius-xl), - 5: var(--#{$prefix}border-radius-2xl), + 5: var(--#{$prefix}border-radius-xxl), circle: 50%, pill: var(--#{$prefix}border-radius-pill) ) diff --git a/scss/_variables.scss b/scss/_variables.scss index fbf9573f6..e2ecda296 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -533,9 +533,12 @@ $border-radius: .375rem !default; $border-radius-sm: .25rem !default; $border-radius-lg: .5rem !default; $border-radius-xl: 1rem !default; -$border-radius-2xl: 2rem !default; +$border-radius-xxl: 2rem !default; $border-radius-pill: 50rem !default; // scss-docs-end border-radius-variables +// fusv-disable +$border-radius-2xl: $border-radius-xxl !default; // Deprecated in v5.3.0 +// fusv-enable // scss-docs-start box-shadow-variables $box-shadow: 0 .5rem 1rem rgba(var(--#{$prefix}body-color-rgb), .15) !default; |