diff options
| author | Mark Otto <[email protected]> | 2017-01-23 23:59:19 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-01-23 23:59:19 -0800 |
| commit | ea6390d513039a18903901e5e6b4603166fc46db (patch) | |
| tree | ad5efddb5cf0be72ee80c994503c30fe7869bfb5 | |
| parent | f18a4cdadd350ca56ca7e75477fe202fcd843c53 (diff) | |
| download | bootstrap-ea6390d513039a18903901e5e6b4603166fc46db.tar.xz bootstrap-ea6390d513039a18903901e5e6b4603166fc46db.zip | |
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.
| -rw-r--r-- | scss/bootstrap-grid.scss | 9 | ||||
| -rw-r--r-- | 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 182b9626b..15987b4bc 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 fd5ba0ca0..5867f08ec 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"; |