From: Mark Otto <markd.otto@gmail.com>
Date: Tue, 24 Jan 2017 07:59:19 +0000 (-0800)
Subject: Update _custom.scss imports in other builds (#21825)
X-Git-Tag: v4.0.0-beta~147^2~179
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea6390d513039a18903901e5e6b4603166fc46db;p=thirdparty%2Fbootstrap.git

Update _custom.scss imports in other builds (#21825)

- Correctly places the _custom.scss file first in the other two buids.
- Also removes the clearfix mixin from the grid build because flexbox yo.
---

diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss
index 182b9626b6..15987b4bcf 100644
--- a/scss/bootstrap-grid.scss
+++ b/scss/bootstrap-grid.scss
@@ -22,22 +22,15 @@ html {
   box-sizing: inherit;
 }
 
-
-//
-// Variables
-//
-
+@import "custom";
 @import "variables";
 
 //
 // Grid mixins
 //
 
-@import "mixins/clearfix";
 @import "mixins/breakpoints";
 @import "mixins/grid-framework";
 @import "mixins/grid";
 
-@import "custom";
-
 @import "grid";
diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss
index fd5ba0ca05..5867f08ec9 100644
--- a/scss/bootstrap-reboot.scss
+++ b/scss/bootstrap-reboot.scss
@@ -2,8 +2,8 @@
 //
 // Includes only Normalize and our custom Reboot reset.
 
+@import "custom";
 @import "variables";
 @import "mixins";
-@import "custom";
 
 @import "reboot";