diff options
| author | Mark Otto <[email protected]> | 2016-02-06 12:32:43 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-02-06 12:32:43 -0800 |
| commit | 3743f279c14abdc1e703d250546ab072b9ad4727 (patch) | |
| tree | 5501c204042347ec5db350c24d9206668d59f756 | |
| parent | 8d46a95071ff2ea1348bc27e88a8043338880279 (diff) | |
| download | bootstrap-3743f279c14abdc1e703d250546ab072b9ad4727.tar.xz bootstrap-3743f279c14abdc1e703d250546ab072b9ad4727.zip | |
linting
| -rw-r--r-- | scss/mixins/_grid-framework.scss | 4 | ||||
| -rw-r--r-- | scss/utilities/_flex.scss | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss index 6009c4343..15d1e6bdf 100644 --- a/scss/mixins/_grid-framework.scss +++ b/scss/mixins/_grid-framework.scss @@ -11,10 +11,10 @@ @if $enable-flex { .col-#{$breakpoint} { position: relative; - max-width: 100%; - min-height: 1px; flex-basis: 0; flex-grow: 1; + max-width: 100%; + min-height: 1px; padding-right: ($grid-gutter-width / 2); padding-left: ($grid-gutter-width / 2); } diff --git a/scss/utilities/_flex.scss b/scss/utilities/_flex.scss index 194e85094..fe91ac121 100644 --- a/scss/utilities/_flex.scss +++ b/scss/utilities/_flex.scss @@ -7,29 +7,29 @@ // Flex column reordering @include media-breakpoint-up($breakpoint) { .flex-#{$breakpoint}-first { order: -1; } - .flex-#{$breakpoint}-last { order: 1; } + .flex-#{$breakpoint}-last { order: 1; } } // Alignment for every item @include media-breakpoint-up($breakpoint) { - .flex-items-#{$breakpoint}-top { align-items: flex-start; } + .flex-items-#{$breakpoint}-top { align-items: flex-start; } .flex-items-#{$breakpoint}-middle { align-items: center; } .flex-items-#{$breakpoint}-bottom { align-items: flex-end; } } // Alignment per item @include media-breakpoint-up($breakpoint) { - .flex-#{$breakpoint}-top { align-self: flex-start; } + .flex-#{$breakpoint}-top { align-self: flex-start; } .flex-#{$breakpoint}-middle { align-self: center; } .flex-#{$breakpoint}-bottom { align-self: flex-end; } } // Horizontal alignment of item @include media-breakpoint-up($breakpoint) { - .flex-items-#{$breakpoint}-left { justify-content: flex-start; } - .flex-items-#{$breakpoint}-center { justify-content: center; } - .flex-items-#{$breakpoint}-right { justify-content: flex-end; } - .flex-items-#{$breakpoint}-around { justify-content: space-around; } + .flex-items-#{$breakpoint}-left { justify-content: flex-start; } + .flex-items-#{$breakpoint}-center { justify-content: center; } + .flex-items-#{$breakpoint}-right { justify-content: flex-end; } + .flex-items-#{$breakpoint}-around { justify-content: space-around; } .flex-items-#{$breakpoint}-between { justify-content: space-between; } } } |