Commit 7b7cf221 authored by Mark Otto's avatar Mark Otto
Browse files

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

parent 0de7321b
Showing with 20 additions and 21 deletions
+20 -21
...@@ -6,7 +6,4 @@ ...@@ -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";
}
...@@ -2,24 +2,26 @@ ...@@ -2,24 +2,26 @@
// //
// 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 {
// Flex column reordering @each $breakpoint in map-keys($grid-breakpoints) {
@include media-breakpoint-up($breakpoint) { // Flex column reordering
.flex-#{$breakpoint}-first { order: -1; } @include media-breakpoint-up($breakpoint) {
.flex-#{$breakpoint}-last { order: 1; } .flex-#{$breakpoint}-first { order: -1; }
} .flex-#{$breakpoint}-last { order: 1; }
}
// Alignment for every column in row // Alignment for every column in row
@include media-breakpoint-up($breakpoint) { @include media-breakpoint-up($breakpoint) {
.flex-items-#{$breakpoint}-top { align-items: flex-start; } .flex-items-#{$breakpoint}-top { align-items: flex-start; }
.flex-items-#{$breakpoint}-center { align-items: center; } .flex-items-#{$breakpoint}-center { align-items: center; }
.flex-items-#{$breakpoint}-bottom { align-items: flex-end; } .flex-items-#{$breakpoint}-bottom { align-items: flex-end; }
} }
// Alignment per column // Alignment per column
@include media-breakpoint-up($breakpoint) { @include media-breakpoint-up($breakpoint) {
.flex-#{$breakpoint}-top { align-self: flex-start; } .flex-#{$breakpoint}-top { align-self: flex-start; }
.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; }
}
} }
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment