From 6e34c9d10e5285a460d85371ca093272f02641f4 Mon Sep 17 00:00:00 2001
From: Jan Stevens <jan@playpass.be>
Date: Fri, 21 Aug 2015 08:55:53 +0200
Subject: Tracking official versions instead of v4-dev, now using v4.0.0-alpha

---
 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 ++++++----
 assets/stylesheets/bootstrap/mixins/_image.scss          |  4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'assets')

diff --git a/assets/stylesheets/bootstrap/_buttons.scss b/assets/stylesheets/bootstrap/_buttons.scss
index 265f357..97d2251 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.disabled,
+a.btn.disaabled,
 fieldset[disabled] a.btn {
   pointer-events: none;
 }
diff --git a/assets/stylesheets/bootstrap/_reboot.scss b/assets/stylesheets/bootstrap/_reboot.scss
index de32aae..fe466da 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: https://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/
+// Credit: shttp://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 2cd88f6..b655a3f 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 Contents
+// Table of ontents
 //
 // Colors
 // Options
diff --git a/assets/stylesheets/bootstrap/mixins/_grid-framework.scss b/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
index aa5f492..ad2060c 100644
--- a/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
+++ b/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
@@ -22,13 +22,15 @@
     @include media-breakpoint-up($breakpoint) {
       // Work around cross-media @extend (https://github.com/sass/sass/issues/1050)
       %grid-column-float-#{$breakpoint} {
-        float: left;
+        @if $enable-flex {
+          // Do nothing
+        } @else {
+          float: left;
+        }
       }
       @for $i from 1 through $columns {
         .col-#{$breakpoint}-#{$i} {
-          @if not $enable-flex {
-            @extend %grid-column-float-#{$breakpoint};
-          }
+          @extend %grid-column-float-#{$breakpoint};
           @include make-col-span($i, $columns);
         }
       }
diff --git a/assets/stylesheets/bootstrap/mixins/_image.scss b/assets/stylesheets/bootstrap/mixins/_image.scss
index e5ae10a..bec9626 100644
--- a/assets/stylesheets/bootstrap/mixins/_image.scss
+++ b/assets/stylesheets/bootstrap/mixins/_image.scss
@@ -19,7 +19,7 @@
 // Short retina mixin for setting background-image and -size.
 
 @mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) {
-  background-image: url($file-1x);
+  background-image: url("#{file-1x}");
 
   @media
   only screen and (-webkit-min-device-pixel-ratio: 2),
@@ -27,7 +27,7 @@
   only screen and (        min-device-pixel-ratio: 2),
   only screen and (                min-resolution: 192dpi),
   only screen and (                min-resolution: 2dppx) {
-    background-image: url($file-2x);
+    background-image: url("#{file-2x}");
     background-size: $width-1x $height-1x;
   }
 }
-- 
cgit v1.2.3