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 182b9626b60d4224ba190800e53eb1fe8d12bea9..15987b4bcf8ac2777d2966c2cb36fae4e1224425 100644 (file)
--- 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 fd5ba0ca05697ea772ed12d2dc1f12b553020942..5867f08ec98c33a19154e70fe076d8dd40f3efa1 100644 (file)
--- 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";