From f895b3160c1054e9aeb3a4ecb5651e97b03e5a0a Mon Sep 17 00:00:00 2001
From: Jan Stevens <jan@playpass.be>
Date: Thu, 20 Aug 2015 10:23:02 +0200
Subject: Updated with newest alpha so we can compile it on ruby

---
 assets/stylesheets/bootstrap/_buttons.scss               |  2 +-
 assets/stylesheets/bootstrap/_reboot.scss                |  2 +-
 assets/stylesheets/bootstrap/_variables.scss             |  2 +-
 assets/stylesheets/bootstrap/mixins/_grid-framework.scss | 10 ++++------
 4 files changed, 7 insertions(+), 9 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/_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..2cd88f6 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
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