From ea6390d513039a18903901e5e6b4603166fc46db Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Mon, 23 Jan 2017 23:59:19 -0800
Subject: [PATCH] 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.
---
 scss/bootstrap-grid.scss   | 9 +--------
 scss/bootstrap-reboot.scss | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss
index 182b9626b60d..15987b4bcf8a 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 fd5ba0ca0569..5867f08ec98c 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";