Skip to content

Commit

Permalink
Update _custom.scss imports in other builds (#21825)
Browse files Browse the repository at this point in the history
- Correctly places the _custom.scss file first in the other two buids.
- Also removes the clearfix mixin from the grid build because flexbox yo.
  • Loading branch information
mdo authored Jan 24, 2017
1 parent f18a4cd commit ea6390d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
9 changes: 1 addition & 8 deletions scss/bootstrap-grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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";
2 changes: 1 addition & 1 deletion scss/bootstrap-reboot.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
//
// Includes only Normalize and our custom Reboot reset.

@import "custom";
@import "variables";
@import "mixins";
@import "custom";

@import "reboot";

0 comments on commit ea6390d

Please sign in to comment.