From a5b567f556a0671ae5fd0f87cee502fa715474fa Mon Sep 17 00:00:00 2001
From: Jan Stevens <jan@playpass.be>
Date: Fri, 21 Aug 2015 09:04:16 +0200
Subject: Back to tracking v4-dev, will start tracking rc releases

---
 assets/stylesheets/bootstrap/_buttons.scss               |  2 +-
 assets/stylesheets/bootstrap/_card.scss                  |  9 ---------
 assets/stylesheets/bootstrap/_forms.scss                 |  4 ++--
 assets/stylesheets/bootstrap/_reboot.scss                |  2 +-
 assets/stylesheets/bootstrap/_variables.scss             | 12 +++++++++++-
 assets/stylesheets/bootstrap/mixins/_grid-framework.scss | 10 ++++------
 6 files changed, 19 insertions(+), 20 deletions(-)

(limited to 'assets')

diff --git a/assets/stylesheets/bootstrap/_buttons.scss b/assets/stylesheets/bootstrap/_buttons.scss
index 97d2251..265f357 100644
--- a/assets/stylesheets/bootstrap/_buttons.scss
+++ b/assets/stylesheets/bootstrap/_buttons.scss
@@ -48,7 +48,7 @@
 }
 
 // Future-proof disabling of clicks on `<a>` elements
-a.btn.disaabled,
+a.btn.disabled,
 fieldset[disabled] a.btn {
   pointer-events: none;
 }
diff --git a/assets/stylesheets/bootstrap/_card.scss b/assets/stylesheets/bootstrap/_card.scss
index b0bac74..0a4f5b6 100644
--- a/assets/stylesheets/bootstrap/_card.scss
+++ b/assets/stylesheets/bootstrap/_card.scss
@@ -2,15 +2,6 @@
 // Base styles
 //
 
-$card-spacer-x:            1.25rem;
-$card-spacer-y:            .75rem;
-$card-border-width:        .0625rem;
-$card-border-radius:       .25rem;
-$card-border-color:        #e5e5e5;
-$card-border-radius-inner: ($card-border-radius - $card-border-width);
-
-$card-cap-bg: #f5f5f5;
-
 .card {
   position: relative;
   margin-bottom: $card-spacer-y;
diff --git a/assets/stylesheets/bootstrap/_forms.scss b/assets/stylesheets/bootstrap/_forms.scss
index 9888da1..6eafd53 100644
--- a/assets/stylesheets/bootstrap/_forms.scss
+++ b/assets/stylesheets/bootstrap/_forms.scss
@@ -148,7 +148,7 @@
   padding: $input-padding-y-sm $input-padding-x-sm;
   font-size: $font-size-sm;
   line-height: $line-height-sm;
-  border-radius: $input-border-radius-sm;
+  @include border-radius($input-border-radius-sm);
 }
 
 .form-control-lg {
@@ -156,7 +156,7 @@
   padding: $input-padding-y-lg $input-padding-x-lg;
   font-size: $font-size-lg;
   line-height: $line-height-lg;
-  border-radius: $input-border-radius-lg;
+  @include border-radius($input-border-radius-lg);
 }
 
 
diff --git a/assets/stylesheets/bootstrap/_reboot.scss b/assets/stylesheets/bootstrap/_reboot.scss
index fe466da..de32aae 100644
--- a/assets/stylesheets/bootstrap/_reboot.scss
+++ b/assets/stylesheets/bootstrap/_reboot.scss
@@ -15,7 +15,7 @@
 // recommendations on resolving such conflicts, see
 // http://getbootstrap.com/getting-started/#third-box-sizing.
 //
-// Credit: shttp://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/
+// Credit: https://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/
 
 html {
   box-sizing: border-box;
diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss
index b655a3f..3b31dbd 100644
--- a/assets/stylesheets/bootstrap/_variables.scss
+++ b/assets/stylesheets/bootstrap/_variables.scss
@@ -4,7 +4,7 @@
 // the Bootstrap defaults without modifying key, versioned files.
 
 
-// Table of ontents
+// Table of Contents
 //
 // Colors
 // Options
@@ -444,6 +444,16 @@ $state-danger-bg:                #f2dede !default;
 $state-danger-border:            darken($state-danger-bg, 5%) !default;
 
 
+// Cards
+$card-spacer-x:            1.25rem;
+$card-spacer-y:            .75rem;
+$card-border-width:        .0625rem;
+$card-border-radius:       .25rem;
+$card-border-color:        #e5e5e5;
+$card-border-radius-inner: ($card-border-radius - $card-border-width);
+
+$card-cap-bg: #f5f5f5;
+
 // Tooltips
 
 $tooltip-max-width:           200px !default;
diff --git a/assets/stylesheets/bootstrap/mixins/_grid-framework.scss b/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
index ad2060c..aa5f492 100644
--- a/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
+++ b/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
@@ -22,15 +22,13 @@
     @include media-breakpoint-up($breakpoint) {
       // Work around cross-media @extend (https://github.com/sass/sass/issues/1050)
       %grid-column-float-#{$breakpoint} {
-        @if $enable-flex {
-          // Do nothing
-        } @else {
-          float: left;
-        }
+        float: left;
       }
       @for $i from 1 through $columns {
         .col-#{$breakpoint}-#{$i} {
-          @extend %grid-column-float-#{$breakpoint};
+          @if not $enable-flex {
+            @extend %grid-column-float-#{$breakpoint};
+          }
           @include make-col-span($i, $columns);
         }
       }
-- 
cgit v1.2.3