Re-introduce collapse

diff --git a/scss/zf-grid/_cell.scss b/scss/zf-grid/_cell.scss
index 877c9c9d46ec1e35d0c8ce27ae5cf2116a7d69f8..3b95fe5111a4011c9d6d0c3d02170646d768b196 100644 (file)
--- a/scss/zf-grid/_cell.scss
+++ b/scss/zf-grid/_cell.scss
@@ -56,16 +56,19 @@
 @mixin -zf-cell-properties($size, $margin-gutter, $vertical) {
   $direction: if($vertical == true, height, width);
   @if($size == 'full') {
-    #{$direction}: calc(100% - #{rem-calc($margin-gutter)});
-    max-#{$direction}: calc(100% - #{rem-calc($margin-gutter)});
+    $val: if($margin-gutter == 0, 100%, calc(100% - #{rem-calc($margin-gutter)}));
+    #{$direction}: $val;
+    max-#{$direction}: $val;
   } @elseif ($size == 'auto') {
     #{$direction}: auto;
-    max-#{$direction}: calc(100% - #{rem-calc($margin-gutter)});
+    $val: if($margin-gutter == 0, 100%, calc(100% - #{rem-calc($margin-gutter)}));
+    max-#{$direction}: $val;
   } @elseif ($size == 'shrink') {
     #{$direction}: auto;
   } @else {
-    #{$direction}: calc(#{zf-cell-size($size)} - #{rem-calc($margin-gutter)});
-    max-#{$direction}: calc(#{zf-cell-size($size)} - #{rem-calc($margin-gutter)});
+    $val: if($margin-gutter == 0, #{zf-cell-size($size)}, calc(#{zf-cell-size($size)} - #{rem-calc($margin-gutter)}));
+    #{$direction}: $val;
+    max-#{$direction}: $val;
   }
 }
 

diff --git a/scss/zf-grid/_classes.scss b/scss/zf-grid/_classes.scss
index 77b6c841c43f52244c1f15505aaa7e4051df6e03..59924f4ddb2b3c6381498b0b1fbac4bb5beb75d8 100644 (file)
--- a/scss/zf-grid/_classes.scss
+++ b/scss/zf-grid/_classes.scss
@@ -205,7 +205,7 @@
   $margin-grid: true,
   $padding-grid: false,
   $vertical-grid: false,
-  $collapse: false,
+  $collapse: true,
   $offset: false
 ) {
 

diff --git a/scss/zf-grid/_collapse.scss b/scss/zf-grid/_collapse.scss
index a9e39d170ff2beb3792ec992d5f37a046fc20c87..44d046d73fe4c233c45497a856e0acfc1a0b2c9a 100644 (file)
--- a/scss/zf-grid/_collapse.scss
+++ b/scss/zf-grid/_collapse.scss
@@ -33,7 +33,7 @@
       @for $i from 1 through $grid-columns {
         // Sizing (percentage)
         > .#{$-zf-size}-#{$i} {
-          @include zf-cell($i, $gutter-output: false, $gutter-type: padding);
+          @include zf-cell-nonresponsive($i, $gutter-output: false, $gutter-type: padding);
         }
       }
     }
@@ -53,9 +53,9 @@
       @for $i from 1 through $grid-columns {
         // Sizing (percentage)
         > .#{$-zf-size}-#{$i} {
-          @include zf-cell($i, $gutter-output: false, $gutter-type: padding);
+          @include zf-cell-nonresponsive($i, $gutter-output: false, $gutter-type: padding);
         }
       }
     }
   }
-}
\ No newline at end of file
+}