0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00

Move the conditional statement back to the file because nested imports aren't supported in Sass

This commit is contained in:
Mark Otto 2016-02-06 01:29:51 -08:00
parent 0de7321bbb
commit 7b7cf221cd
2 changed files with 20 additions and 21 deletions

View File

@ -6,7 +6,4 @@
@import "utilities/spacing"; @import "utilities/spacing";
@import "utilities/text"; @import "utilities/text";
@import "utilities/visibility"; @import "utilities/visibility";
@if $enable-flex and $enable-grid-classes {
@import "utilities/flex"; @import "utilities/flex";
}

View File

@ -2,6 +2,7 @@
// //
// Custom styles for additional flex alignment options. // Custom styles for additional flex alignment options.
@if $enable-flex and $enable-grid-classes {
@each $breakpoint in map-keys($grid-breakpoints) { @each $breakpoint in map-keys($grid-breakpoints) {
// Flex column reordering // Flex column reordering
@include media-breakpoint-up($breakpoint) { @include media-breakpoint-up($breakpoint) {
@ -23,3 +24,4 @@
.flex-#{$breakpoint}-bottom { align-self: flex-end; } .flex-#{$breakpoint}-bottom { align-self: flex-end; }
} }
} }
}