mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-20 20:31:26 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
scss/_utilities.scss
View File

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

4
scss/utilities/_flex.scss
View File

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