Merge pull request #20684 from twbs/v4-utils

v4: The Utilities Update

scss/_images.scss

@@ -6,13 +6,9 @@
 // which weren't expecting the images within themselves to be involuntarily resized.
 // See also https://github.com/twbs/bootstrap/issues/18178
 .img-fluid {
-  @include img-fluid();
+  @include img-fluid;
 }
 
-// Rounded corners
-.img-rounded {
-  @include border-radius($border-radius-lg);
-}
 
 // Image thumbnails
 .img-thumbnail {
@@ -24,12 +20,7 @@
   @include box-shadow($thumbnail-box-shadow);
 
   // Keep them at most 100% wide
-  @include img-fluid(inline-block);
-}
-
-// Perfect circle
-.img-circle {
-  border-radius: 50%;
+  @include img-fluid;
 }
 
 //

scss/_mixins.scss

@@ -51,4 +51,4 @@
 // @import "mixins/navbar-align";
 @import "mixins/grid-framework";
 @import "mixins/grid";
-@import "mixins/pulls";
+@import "mixins/float";

scss/_utilities.scss

@@ -1,8 +1,9 @@
 @import "utilities/background";
+@import "utilities/borders";
 @import "utilities/clearfix";
 @import "utilities/display";
 @import "utilities/flex";
-@import "utilities/pulls";
+@import "utilities/float";
 @import "utilities/screenreaders";
 @import "utilities/spacing";
 @import "utilities/text";

scss/mixins/_background-variant.scss

@@ -2,7 +2,6 @@
 
 @mixin bg-variant($parent, $color) {
   #{$parent} {
-    color: #fff !important;
     background-color: $color !important;
   }
   a#{$parent} {

scss/mixins/_float.scss

@@ -1,6 +1,6 @@
-@mixin pull-left {
+@mixin float-left {
   float: left !important;
 }
-@mixin pull-right {
+@mixin float-right {
   float: right !important;
 }

scss/mixins/_image.scss

@@ -7,10 +7,12 @@
 //
 // Keep images from scaling beyond the width of their parents.
 
-@mixin img-fluid($display: block) {
-  display: $display;
-  max-width: 100%; // Part 1: Set a maximum relative to the parent
-  height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
+@mixin img-fluid {
+  // Part 1: Set a maximum relative to the parent
+  max-width: 100%;
+  // Part 2: Override the height to auto, otherwise images will be stretched
+  // when setting a width and height attribute on the img element.
+  height: auto;
 }
 
 

scss/utilities/_borders.scss

@@ -0,0 +1,30 @@
+//
+// Border-width
+//
+
+// TBD...?
+
+
+//
+// Border-radius
+//
+
+.rounded {
+  @include border-radius($border-radius);
+}
+.rounded-top {
+  @include border-top-radius($border-radius);
+}
+.rounded-right {
+  @include border-right-radius($border-radius);
+}
+.rounded-bottom {
+  @include border-bottom-radius($border-radius);
+}
+.rounded-left {
+  @include border-left-radius($border-radius);
+}
+
+.rounded-circle {
+  border-radius: 50%;
+}

scss/utilities/_float.scss

@@ -0,0 +1,13 @@
+@each $breakpoint in map-keys($grid-breakpoints) {
+  @include media-breakpoint-up($breakpoint) {
+    .float-#{$breakpoint}-left {
+      @include float-left();
+    }
+    .float-#{$breakpoint}-right {
+      @include float-right();
+    }
+    .float-#{$breakpoint}-none {
+      float: none !important;
+    }
+  }
+}

scss/utilities/_pulls.scss

@@ -1,13 +0,0 @@
-@each $breakpoint in map-keys($grid-breakpoints) {
-  @include media-breakpoint-up($breakpoint) {
-    .pull-#{$breakpoint}-left {
-      @include pull-left();
-    }
-    .pull-#{$breakpoint}-right {
-      @include pull-right();
-    }
-    .pull-#{$breakpoint}-none {
-      float: none !important;
-    }
-  }
-}

scss/utilities/_spacing.scss

@@ -4,7 +4,7 @@
 
 // Margin and Padding
 
-.m-x-auto {
+.mx-auto {
   margin-right: auto !important;
   margin-left:  auto !important;
 }
@@ -14,18 +14,18 @@
     $length-x:   map-get($lengths, x);
     $length-y:   map-get($lengths, y);
 
-    .#{$abbrev}-a-#{$size} { #{$prop}:        $length-y $length-x !important; } // a = All sides
-    .#{$abbrev}-t-#{$size} { #{$prop}-top:    $length-y !important; }
-    .#{$abbrev}-r-#{$size} { #{$prop}-right:  $length-x !important; }
-    .#{$abbrev}-b-#{$size} { #{$prop}-bottom: $length-y !important; }
-    .#{$abbrev}-l-#{$size} { #{$prop}-left:   $length-x !important; }
+    .#{$abbrev}-#{$size} { #{$prop}:        $length-y $length-x !important; } // a = All sides
+    .#{$abbrev}t-#{$size} { #{$prop}-top:    $length-y !important; }
+    .#{$abbrev}r-#{$size} { #{$prop}-right:  $length-x !important; }
+    .#{$abbrev}b-#{$size} { #{$prop}-bottom: $length-y !important; }
+    .#{$abbrev}l-#{$size} { #{$prop}-left:   $length-x !important; }
 
     // Axes
-    .#{$abbrev}-x-#{$size} {
+    .#{$abbrev}x-#{$size} {
       #{$prop}-right:  $length-x !important;
       #{$prop}-left:   $length-x !important;
     }
-    .#{$abbrev}-y-#{$size} {
+    .#{$abbrev}y-#{$size} {
       #{$prop}-top:    $length-y !important;
       #{$prop}-bottom: $length-y !important;
     }

scss/utilities/_text.scss

@@ -32,6 +32,10 @@
 
 // Contextual colors
 
+.text-white {
+  color: #fff !important;
+}
+
 @include text-emphasis-variant('.text-muted', $text-muted);
 
 @include text-emphasis-variant('.text-primary', $brand-primary);