mirror of
https://github.com/twbs/bootstrap.git
synced 2024-11-29 11:24:18 +01:00
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.
This commit is contained in:
parent
f18a4cdadd
commit
ea6390d513
9
scss/bootstrap-grid.scss
vendored
9
scss/bootstrap-grid.scss
vendored
@ -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
scss/bootstrap-reboot.scss
vendored
2
scss/bootstrap-reboot.scss
vendored
@ -2,8 +2,8 @@
|
||||
//
|
||||
// Includes only Normalize and our custom Reboot reset.
|
||||
|
||||
@import "custom";
|
||||
@import "variables";
|
||||
@import "mixins";
|
||||
@import "custom";
|
||||
|
||||
@import "reboot";
|
||||
|
Loading…
Reference in New Issue
Block a user