rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Update _custom.scss imports in other builds (#21825)

Browse Source 
- 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:
Mark Otto 2017-01-23 23:59:19 -08:00 committed by GitHub
parent f18a4cdadd
commit ea6390d513
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scss/bootstrap-grid.scss vendored
View File

@ -22,22 +22,15 @@ html {
box-sizing: inherit; box-sizing: inherit;
} }
@import "custom";
//
// Variables
//
@import "variables"; @import "variables";
// //
// Grid mixins // Grid mixins
// //
@import "mixins/clearfix";
@import "mixins/breakpoints"; @import "mixins/breakpoints";
@import "mixins/grid-framework"; @import "mixins/grid-framework";
@import "mixins/grid"; @import "mixins/grid";
@import "custom";
@import "grid"; @import "grid";

2
scss/bootstrap-reboot.scss vendored
View File

@ -2,8 +2,8 @@
// //
// Includes only Normalize and our custom Reboot reset. // Includes only Normalize and our custom Reboot reset.
@import "custom";
@import "variables"; @import "variables";
@import "mixins"; @import "mixins";
@import "custom";
@import "reboot"; @import "reboot";