Rename rounded-pill to border-radius-pill to match

Also reorder some variables while I'm here to make more sense
twbs · Oct 28, 2020 · 3b76255 · 3b76255
1 parent 7af45bb
commit 3b76255
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/scss/_utilities.scss b/scss/_utilities.scss
@@ -502,7 +502,7 @@ $utilities: map-merge(
         2: $border-radius,
         3: $border-radius-lg,
         circle: 50%,
-        pill: $rounded-pill
+        pill: $border-radius-pill
       )
     ),
     "rounded-top": (

diff --git a/scss/_variables.scss b/scss/_variables.scss
@@ -345,11 +345,6 @@ $container-padding-x: $grid-gutter-width !default;
 // Define common padding and border radius sizes and more.
 
 $border-width:                1px !default;
-$border-color:                $gray-300 !default;
-
-$border-radius:               .25rem !default;
-$border-radius-sm:            .2rem !default;
-$border-radius-lg:            .3rem !default;
 $border-widths: (
   0: 0,
   1: 1px,
@@ -359,7 +354,12 @@ $border-widths: (
   5: 5px
 ) !default;
 
-$rounded-pill:                50rem !default;
+$border-color:                $gray-300 !default;
+
+$border-radius:               .25rem !default;
+$border-radius-sm:            .2rem !default;
+$border-radius-lg:            .3rem !default;
+$border-radius-pill:          50rem !default;
 
 $box-shadow:                  0 .5rem 1rem rgba($black, .15) !default;
 $box-shadow-sm:               0 .125rem .25rem rgba($black, .075) !default;