scss/foundation/components/_grid.scss in zurb-foundation-4.1.6 vs scss/foundation/components/_grid.scss in zurb-foundation-4.2.0

- old
+ new

@@ -136,11 +136,11 @@ @for $i from 1 through $total-columns { .small#{-$i} { @include grid-column($columns:$i,$collapse:null,$float:false); } } - @for $i from 1 through $total-columns - 2 { + @for $i from 0 through $total-columns - 2 { .small-offset-#{$i} { @include grid-column($offset:$i, $collapse:null,$float:false); } } [class*="column"] + [class*="column"]:last-child { float: $opposite-direction; } [class*="column"] + [class*="column"].end { float: $default-float; } @@ -154,32 +154,33 @@ @for $i from 1 through $total-columns { .large#{-$i} { @include grid-column($columns:$i,$collapse:null,$float:false); } } - @for $i from 1 through $total-columns - 1 { + @for $i from 0 through $total-columns - 1 { .row .large-offset-#{$i} { @include grid-column($offset:$i, $collapse:null,$float:false); } } @for $i from 1 through $total-columns - 1 { .push#{-$i} { @include grid-column($push:$i, $collapse:null, $float:false); } .pull#{-$i} { @include grid-column($pull:$i, $collapse:null, $float:false); } } - @for $i from 1 through $total-columns - 1 { - .small-push#{-$i} { #{$default-float}: inherit; } - .small-pull#{-$i} { #{$opposite-direction}: inherit; } - } - .column.large-centered, .columns.large-centered { @include grid-column($center:true, $collapse:null, $float:false); } .column.large-uncentered, - .columns.large-uncentered, { + .columns.large-uncentered { margin-#{$default-float}: 0; margin-#{$opposite-direction}: 0; - float: none; + float: $default-float !important; } + + .column.large-uncentered.opposite, + .columns.large-uncentered.opposite { + float: $opposite-direction !important; + } + } }