Merge branch 'main' into main-jd-add-chips

diff --cc .bundlewatch.config.json
Simple merge

diff --cc scss/_variables.scss
index 61d37df73ec4e0bc3cd526d6b568d4f6ae00a331,06531395ea781934c411415c2dbe9ca9038e1013..d1609774c4d3d6242b8c6e247f9b1d5684a8c7c2
--- 1/scss/_variables.scss
--- 2/scss/_variables.scss
+++ b/scss/_variables.scss
@@@ -1482,41 -1491,9 +1491,41 @@@ $badge-font-weight:                 $fo
  $badge-color:                       $white !default;
  $badge-padding-y:                   .35em !default;
  $badge-padding-x:                   .65em !default;
- $badge-border-radius:               $border-radius !default;
+ $badge-border-radius:               var(--#{$prefix}border-radius) !default;
  // scss-docs-end badge-variables
  
 +// Chips
 +
 +// scss-docs-start chip-variables
 +$chip-gap:                           map-get($spacers, 1) !default;
 +$chip-font-shift:                    $spacer * .1 !default;
 +$chip-font-weight:                   $font-weight-normal !default;
 +$chip-border-width:                  $border-width !default;
 +$chip-border-radius:                 $border-radius !default;
 +
 +$chip-padding-x:                     $spacer * .65 !default;
 +$chip-padding-y:                     $spacer * .45 !default;
 +$chip-icon-size:                     $spacer * 1.2 !default;
 +$chip-icon-margin-start:             -$spacer * .35 !default;
 +$chip-close-margin-end:              -$spacer * .3 !default;
 +$chip-close-margin-start:            $spacer * .2 !default;
 +$chip-font-size:                     $font-size-base !default;
 +
 +$chip-active-color:                  $component-active-color !default;
 +$chip-disabled-color:                $gray-500 !default;
 +$chip-border-color:                  $gray-500 !default;
 +$chip-active-decoration-color:       $component-active-bg !default;
 +// scss-docs-end chip-variables
 +
 +// scss-docs-start chip-sm-variables
 +$chip-padding-x-sm:                  $spacer * .4 !default;
 +$chip-padding-y-sm:                  $spacer * .25 !default;
 +$chip-icon-size-sm:                  $spacer !default;
 +$chip-icon-margin-start-sm:          -$spacer * .1 !default;
 +$chip-close-margin-end-sm:           -$spacer * .25 !default;
 +$chip-close-margin-start-sm:         0 !default;
 +$chip-font-size-sm:                  $font-size-sm !default;
 +// scss-docs-end chip-sm-variables
  
  // Modals
  

diff --cc scss/forms/_form-check.scss
Simple merge