scss/foundation/components/_grid.scss in zurb-foundation-4.1.5 vs scss/foundation/components/_grid.scss in zurb-foundation-4.1.6
- old
+ new
@@ -1,8 +1,10 @@
//
// Grid Variables
//
+$include-html-grid-classes: $include-html-classes !default;
+
$row-width: emCalc(1000px) !default;
$column-gutter: emCalc(30px) !default;
$total-columns: 12 !default;
//
@@ -107,13 +109,12 @@
}
}
-/* Grid HTML Classes */
@if $include-html-grid-classes != false {
-
+ /* Grid HTML Classes */
.row {
@include grid-row;
&.collapse {
.column,
@@ -167,18 +168,18 @@
@for $i from 1 through $total-columns - 1 {
.small-push#{-$i} { #{$default-float}: inherit; }
.small-pull#{-$i} { #{$opposite-direction}: inherit; }
}
- .column.small-centered,
- .columns.small-centered {
+ .column.large-centered,
+ .columns.large-centered { @include grid-column($center:true, $collapse:null, $float:false); }
+
+ .column.large-uncentered,
+ .columns.large-uncentered, {
margin-#{$default-float}: 0;
margin-#{$opposite-direction}: 0;
- float: $default-float !important;
+ float: none;
}
-
- .column.large-centered,
- .columns.large-centered { @include grid-column($center:true, $collapse:null, $float:false); }
}
}