Merge branch 'v4-dev' into v4-navbars

8 files changed, 64 insertions, 28 deletions

diff --git a/scss/utilities/_background.scss b/scss/utilities/_background.scss
index b1589792f..a81dcff2c 100644
--- a/scss/utilities/_background.scss
+++ b/scss/utilities/_background.scss
@@ -2,10 +2,6 @@
 // Contextual backgrounds
 //
 
-.bg-inverse {
-  background-color: $brand-inverse;
-}
-
 .bg-faded {
   background-color: $gray-lightest;
 }
@@ -19,3 +15,5 @@
 @include bg-variant('.bg-warning', $brand-warning);
 
 @include bg-variant('.bg-danger', $brand-danger);
+
+@include bg-variant('.bg-inverse', $brand-inverse);
diff --git a/scss/utilities/_borders.scss b/scss/utilities/_borders.scss
new file mode 100644
index 000000000..b2e70aaf5
--- /dev/null
+++ b/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%;
+}
diff --git a/scss/utilities/_flex.scss b/scss/utilities/_flex.scss
index a61135ce2..502885a81 100644
--- a/scss/utilities/_flex.scss
+++ b/scss/utilities/_flex.scss
@@ -8,6 +8,7 @@
     @include media-breakpoint-up($breakpoint) {
       .flex-#{$breakpoint}-first { order: -1; }
       .flex-#{$breakpoint}-last { order: 1; }
+      .flex-#{$breakpoint}-unordered { order: 0; }
     }
 
     // Alignment for every item
diff --git a/scss/utilities/_float.scss b/scss/utilities/_float.scss
new file mode 100644
index 000000000..eea34bff2
--- /dev/null
+++ b/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;
+    }
+  }
+}
diff --git a/scss/utilities/_pulls.scss b/scss/utilities/_pulls.scss
deleted file mode 100644
index 7fec56c9a..000000000
--- a/scss/utilities/_pulls.scss
+++ /dev/null
@@ -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;
-    }
-  }
-}
diff --git a/scss/utilities/_spacing.scss b/scss/utilities/_spacing.scss
index b7ff044b6..99c98f87b 100644
--- a/scss/utilities/_spacing.scss
+++ b/scss/utilities/_spacing.scss
@@ -1,10 +1,11 @@
-// Width
+// Width and height
 
 .w-100 { width: 100% !important; }
+.h-100 { height: 100% !important; }
 
 // Margin and Padding
 
-.m-x-auto {
+.mx-auto {
   margin-right: auto !important;
   margin-left:  auto !important;
 }
@@ -14,18 +15,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;
     }
diff --git a/scss/utilities/_text.scss b/scss/utilities/_text.scss
index 901f77144..b4468e98d 100644
--- a/scss/utilities/_text.scss
+++ b/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);
@@ -44,6 +48,10 @@
 
 @include text-emphasis-variant('.text-danger', $brand-danger);
 
+// Font color
+
+@include text-emphasis-variant('.text-gray-dark', $gray-dark);
+
 // Misc
 
 .text-hide {
diff --git a/scss/utilities/_visibility.scss b/scss/utilities/_visibility.scss
index 63891677e..cdb142869 100644
--- a/scss/utilities/_visibility.scss
+++ b/scss/utilities/_visibility.scss
@@ -1,5 +1,3 @@
-// scss-lint:disable ImportantRule
-
 //
 // Visibility utilities
 //