rake update[v4-dev]

4 files changed, 5 insertions, 7 deletions

diff --git a/assets/stylesheets/bootstrap/_alert.scss b/assets/stylesheets/bootstrap/_alert.scss
index e52e957..8e550d8 100644
--- a/assets/stylesheets/bootstrap/_alert.scss
+++ b/assets/stylesheets/bootstrap/_alert.scss
@@ -61,5 +61,5 @@
   @include alert-variant($alert-warning-bg, $alert-warning-border, $alert-warning-text);
 }
 .alert-danger {
-  @include alert-variant($alert-danger-bg, $alert-danger-border,$alert-danger-text);
+  @include alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-text);
 }
diff --git a/assets/stylesheets/bootstrap/_card.scss b/assets/stylesheets/bootstrap/_card.scss
index 03079f9..aff6036 100644
--- a/assets/stylesheets/bootstrap/_card.scss
+++ b/assets/stylesheets/bootstrap/_card.scss
@@ -5,7 +5,7 @@
 .card {
   position: relative;
   margin-bottom: $card-spacer-y;
-  background-color: #fff;
+  background-color: $card-bg;
   border: $card-border-width solid $card-border-color;
   @include border-radius($card-border-radius);
 }
diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss
index 471c88f..60adc77 100644
--- a/assets/stylesheets/bootstrap/_variables.scss
+++ b/assets/stylesheets/bootstrap/_variables.scss
@@ -454,6 +454,7 @@ $card-border-radius:       .25rem !default;
 $card-border-color:        #e5e5e5 !default;
 $card-border-radius-inner: ($card-border-radius - $card-border-width) !default;
 $card-cap-bg:              #f5f5f5 !default;
+$card-bg:                  #fff !default;
 
 // Tooltips
 
diff --git a/assets/stylesheets/bootstrap/mixins/_grid.scss b/assets/stylesheets/bootstrap/mixins/_grid.scss
index 585c80f..3fc45f4 100644
--- a/assets/stylesheets/bootstrap/mixins/_grid.scss
+++ b/assets/stylesheets/bootstrap/mixins/_grid.scss
@@ -7,8 +7,7 @@
   margin-left: auto;
   padding-left:  ($gutter / 2);
   padding-right: ($gutter / 2);
-  @if $enable-flex {
-  } @else {
+  @if not $enable-flex {
     @include clearfix();
   }
 }
@@ -36,9 +35,7 @@
 
 @mixin make-col($gutter: $grid-gutter-width) {
   position: relative;
-  @if $enable-flex {
-    // Do nothing
-  } @else {
+  @if not $enable-flex {
     float: left;
   }
   min-height: 1px;