Commit 044716ed authored by Mark Otto's avatar Mark Otto
Browse files

Conditionally include the flex utils in the import stack and reduce to a single query

parent f50dedaa
Showing with 16 additions and 22 deletions
+16 -22
...@@ -6,3 +6,7 @@ ...@@ -6,3 +6,7 @@
@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";
}
...@@ -2,34 +2,24 @@ ...@@ -2,34 +2,24 @@
// //
// 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) {
// Flex column reordering // Flex column reordering
@include media-breakpoint-up($breakpoint) {
@each $breakpoint in map-keys($grid-breakpoints) { .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) {
@each $breakpoint in map-keys($grid-breakpoints) { .flex-all-#{$breakpoint}-top { align-items: flex-start; }
@include media-breakpoint-up($breakpoint) { .flex-all-#{$breakpoint}-center { align-items: center; }
.flex-all-#{$breakpoint}-top { align-items: flex-start; } .flex-all-#{$breakpoint}-bottom { align-items: flex-end; }
.flex-all-#{$breakpoint}-center { align-items: center; }
.flex-all-#{$breakpoint}-bottom { align-items: flex-end; }
}
} }
// Alignment per column // Alignment per column
@include media-breakpoint-up($breakpoint) {
@each $breakpoint in map-keys($grid-breakpoints) { .flex-#{$breakpoint}-top { align-self: flex-start; }
@include media-breakpoint-up($breakpoint) { .flex-#{$breakpoint}-center { align-self: center; }
.flex-#{$breakpoint}-top { align-self: flex-start; } .flex-#{$breakpoint}-bottom { align-self: flex-end; }
.flex-#{$breakpoint}-center { align-self: center; }
.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