Remove unnecessary max-width on sizes

diff --git a/scss/zf-grid/_cell.scss b/scss/zf-grid/_cell.scss
index 3b95fe5111a4011c9d6d0c3d02170646d768b196..e323339cdd89c4c50a655ebaa975a02e469d9484 100644 (file)
--- a/scss/zf-grid/_cell.scss
+++ b/scss/zf-grid/_cell.scss
@@ -58,17 +58,14 @@
   @if($size == 'full') {
     $val: if($margin-gutter == 0, 100%, calc(100% - #{rem-calc($margin-gutter)}));
     #{$direction}: $val;
-    max-#{$direction}: $val;
   } @elseif ($size == 'auto') {
     #{$direction}: auto;
     $val: if($margin-gutter == 0, 100%, calc(100% - #{rem-calc($margin-gutter)}));
-    max-#{$direction}: $val;
   } @elseif ($size == 'shrink') {
     #{$direction}: auto;
   } @else {
     $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 1bb457fd0402293ba5315b35620c94f20694ba1c..5e62dfe5a121855bb87d54c447450df3479aaeb0 100644 (file)
--- a/scss/zf-grid/_classes.scss
+++ b/scss/zf-grid/_classes.scss
@@ -34,14 +34,17 @@
   }
 
   // Auto width
-  @include -zf-each-breakpoint(false) {
-    .grid > .#{$-zf-size}-auto {
-      @include zf-cell-base(auto);
-    }
+  @include -zf-each-breakpoint() {
+    @if not($-zf-size == small) {
+      .grid > .#{$-zf-size}-auto {
+        @include zf-cell-base(auto);
+      }
 
-    .grid > .#{$-zf-size}-shrink {
-      @include zf-cell-base(shrink);
+      .grid > .#{$-zf-size}-shrink {
+        @include zf-cell-base(shrink);
+      }
     }
+
     @for $i from 1 through $grid-columns {
       // Sizing (percentage)
       .#{$-zf-size}-#{$i} {