From c1c1b3885d653fcffbfd819dbaa56ee41ef6196d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 8 Dec 2015 01:50:42 -0800 Subject: [PATCH] Remove useless .col-*-offset-12 and .col-xs-offset-0 classes Fixes #18036 [skip sauce] [skip validator] --- scss/mixins/_grid-framework.scss | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss index aa5f4924ae..bfe379ef82 100644 --- a/scss/mixins/_grid-framework.scss +++ b/scss/mixins/_grid-framework.scss @@ -13,7 +13,9 @@ padding-left: ($gutter / 2); padding-right: ($gutter / 2); } + $breakpoint-counter: 0; @each $breakpoint in map-keys($breakpoints) { + $breakpoint-counter: ($breakpoint-counter + 1); @for $i from 1 through $columns { .col-#{$breakpoint}-#{$i} { @extend %grid-column; @@ -32,13 +34,21 @@ @include make-col-span($i, $columns); } } - @each $modifier in (pull, push, offset) { + @each $modifier in (pull, push) { @for $i from 0 through $columns { .col-#{$breakpoint}-#{$modifier}-#{$i} { @include make-col-modifier($modifier, $i, $columns) } } } + // `$columns - 1` because offsetting by the width of an entire row isn't possible + @for $i from 0 through ($columns - 1) { + @if $breakpoint-counter != 1 or $i != 0 { // Avoid emitting useless .col-xs-offset-0 + .col-#{$breakpoint}-offset-#{$i} { + @include make-col-modifier(offset, $i, $columns) + } + } + } } } }