Skip to content

Commit 3b9b154

Browse files
authoredMar 25, 2023
Use border-radius CSS variables in more components (#38284)
* Update _variables.scss missing global variable on nav-pills-border-radius * Update _variables.scss
1 parent 33ad338 commit 3b9b154

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed
 

‎scss/_variables.scss

+12-12
Original file line numberDiff line numberDiff line change
@@ -840,9 +840,9 @@ $btn-link-hover-color: var(--#{$prefix}link-hover-color) !default;
840840
$btn-link-disabled-color: $gray-600 !default;
841841

842842
// Allows for customizing button radius independently from global border radius
843-
$btn-border-radius: $border-radius !default;
844-
$btn-border-radius-sm: $border-radius-sm !default;
845-
$btn-border-radius-lg: $border-radius-lg !default;
843+
$btn-border-radius: var(--#{$prefix}border-radius) !default;
844+
$btn-border-radius-sm: var(--#{$prefix}border-radius-sm) !default;
845+
$btn-border-radius-lg: var(--#{$prefix}border-radius-lg) !default;
846846

847847
$btn-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;
848848

@@ -901,9 +901,9 @@ $input-border-color: var(--#{$prefix}border-color) !default;
901901
$input-border-width: $input-btn-border-width !default;
902902
$input-box-shadow: $box-shadow-inset !default;
903903

904-
$input-border-radius: $border-radius !default;
905-
$input-border-radius-sm: $border-radius-sm !default;
906-
$input-border-radius-lg: $border-radius-lg !default;
904+
$input-border-radius: var(--#{$prefix}border-radius) !default;
905+
$input-border-radius-sm: var(--#{$prefix}border-radius-sm) !default;
906+
$input-border-radius-lg: var(--#{$prefix}border-radius-lg) !default;
907907

908908
$input-focus-bg: $input-bg !default;
909909
$input-focus-border-color: tint-color($component-active-bg, 50%) !default;
@@ -1168,7 +1168,7 @@ $nav-tabs-link-active-color: var(--#{$prefix}emphasis-color) !default;
11681168
$nav-tabs-link-active-bg: var(--#{$prefix}body-bg) !default;
11691169
$nav-tabs-link-active-border-color: var(--#{$prefix}border-color) var(--#{$prefix}border-color) $nav-tabs-link-active-bg !default;
11701170

1171-
$nav-pills-border-radius: $border-radius !default;
1171+
$nav-pills-border-radius: var(--#{$prefix}border-radius) !default;
11721172
$nav-pills-link-active-color: $component-active-color !default;
11731173
$nav-pills-link-active-bg: $component-active-bg !default;
11741174

@@ -1236,7 +1236,7 @@ $dropdown-font-size: $font-size-base !default;
12361236
$dropdown-color: var(--#{$prefix}body-color) !default;
12371237
$dropdown-bg: var(--#{$prefix}body-bg) !default;
12381238
$dropdown-border-color: var(--#{$prefix}border-color-translucent) !default;
1239-
$dropdown-border-radius: $border-radius !default;
1239+
$dropdown-border-radius: var(--#{$prefix}border-radius) !default;
12401240
$dropdown-border-width: var(--#{$prefix}border-width) !default;
12411241
$dropdown-inner-border-radius: calc($dropdown-border-radius - $dropdown-border-width) !default; // stylelint-disable-line function-disallowed-list
12421242
$dropdown-divider-bg: $dropdown-border-color !default;
@@ -1317,8 +1317,8 @@ $pagination-disabled-border-color: var(--#{$prefix}border-color) !default;
13171317

13181318
$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;
13191319

1320-
$pagination-border-radius-sm: $border-radius-sm !default;
1321-
$pagination-border-radius-lg: $border-radius-lg !default;
1320+
$pagination-border-radius-sm: var(--#{$prefix}border-radius-sm) !default;
1321+
$pagination-border-radius-lg: var(--#{$prefix}border-radius-lg) !default;
13221322
// scss-docs-end pagination-variables
13231323

13241324

@@ -1482,7 +1482,7 @@ $badge-font-weight: $font-weight-bold !default;
14821482
$badge-color: $white !default;
14831483
$badge-padding-y: .35em !default;
14841484
$badge-padding-x: .65em !default;
1485-
$badge-border-radius: $border-radius !default;
1485+
$badge-border-radius: var(--#{$prefix}border-radius) !default;
14861486
// scss-docs-end badge-variables
14871487

14881488

@@ -1540,7 +1540,7 @@ $modal-scale-transform: scale(1.02) !default;
15401540
$alert-padding-y: $spacer !default;
15411541
$alert-padding-x: $spacer !default;
15421542
$alert-margin-bottom: 1rem !default;
1543-
$alert-border-radius: $border-radius !default;
1543+
$alert-border-radius: var(--#{$prefix}border-radius) !default;
15441544
$alert-link-font-weight: $font-weight-bold !default;
15451545
$alert-border-width: var(--#{$prefix}border-width) !default;
15461546
$alert-bg-scale: -80% !default;

0 commit comments

Comments
 (0)