rake update[v4-dev]

5 files changed, 22 insertions, 8 deletions

diff --git a/assets/stylesheets/bootstrap/_input-group.scss b/assets/stylesheets/bootstrap/_input-group.scss
index 1c651d1..fff9cb5 100644
--- a/assets/stylesheets/bootstrap/_input-group.scss
+++ b/assets/stylesheets/bootstrap/_input-group.scss
@@ -40,9 +40,7 @@
 .input-group-addon,
 .input-group-btn,
 .input-group .form-control {
-  @if $enable-flex {
-    // do nothing
-  } @else {
+  @if not $enable-flex {
     display: table-cell;
   }
 
@@ -53,9 +51,7 @@
 
 .input-group-addon,
 .input-group-btn {
-  @if $enable-flex {
-    // do nothing
-  } @else {
+  @if not $enable-flex {
     width: 1%;
   }
   white-space: nowrap;
diff --git a/assets/stylesheets/bootstrap/_utilities.scss b/assets/stylesheets/bootstrap/_utilities.scss
index 3f9e81f..87b8ba6 100644
--- a/assets/stylesheets/bootstrap/_utilities.scss
+++ b/assets/stylesheets/bootstrap/_utilities.scss
@@ -1,8 +1,9 @@
 @import "utilities/background";
 @import "utilities/clearfix";
+@import "utilities/display";
+@import "utilities/flex";
 @import "utilities/pulls";
 @import "utilities/screenreaders";
 @import "utilities/spacing";
 @import "utilities/text";
 @import "utilities/visibility";
-@import "utilities/flex";
diff --git a/assets/stylesheets/bootstrap/mixins/_grid-framework.scss b/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
index dcdec80..cb25be9 100644
--- a/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
+++ b/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
@@ -36,7 +36,7 @@
 
       // `$columns - 1` because offsetting by the width of an entire row isn't possible
       @for $i from 0 through ($columns - 1) {
-        @if $breakpoint-counter != 1 or $i != 0 { // Avoid emitting useless .col-xs-offset-0
+        @if $breakpoint-counter != 1 or $i != 0 { // Avoid emitting useless .offset-xs-0
           .offset-#{$breakpoint}-#{$i} {
             @include make-col-modifier(offset, $i, $columns)
           }
diff --git a/assets/stylesheets/bootstrap/utilities/_display.scss b/assets/stylesheets/bootstrap/utilities/_display.scss
new file mode 100644
index 0000000..d74049b
--- /dev/null
+++ b/assets/stylesheets/bootstrap/utilities/_display.scss
@@ -0,0 +1,13 @@
+//
+// Display utilities
+//
+
+.d-block {
+  display: block !important;
+}
+.d-inline-block {
+  display: inline-block !important;
+}
+.d-inline {
+  display: inline !important;
+}
diff --git a/assets/stylesheets/bootstrap/utilities/_spacing.scss b/assets/stylesheets/bootstrap/utilities/_spacing.scss
index cd543c8..b7ff044 100644
--- a/assets/stylesheets/bootstrap/utilities/_spacing.scss
+++ b/assets/stylesheets/bootstrap/utilities/_spacing.scss
@@ -1,3 +1,7 @@
+// Width
+
+.w-100 { width: 100% !important; }
+
 // Margin and Padding
 
 .m-x-auto {