Clean up bugs noted by Brett

diff --git a/scss/zf-grid/_cell.scss b/scss/zf-grid/_cell.scss
index cb7c2d7e4b2a0716b97e01f0878a851de0201e22..4c7d5666cf1fd4789bf47c30a7cf163882afc96e 100644 (file)
--- a/scss/zf-grid/_cell.scss
+++ b/scss/zf-grid/_cell.scss
@@ -101,7 +101,7 @@
   // TODO: figure out how we want to define this
 }
 
-@mixin zf-cell-nonresponsive(
+@mixin zf-cell-static(
   $size: full,
   $gutter-output: true,
   $gutters:$grid-margin-gutters,

diff --git a/scss/zf-grid/_classes.scss b/scss/zf-grid/_classes.scss
index 8505857f131a6a59902b92fa99041c70e72af012..eeda9d1c6e0877bcdfcd8e57dfd7c2566bee1cce 100644 (file)
--- a/scss/zf-grid/_classes.scss
+++ b/scss/zf-grid/_classes.scss
@@ -48,7 +48,7 @@
     @for $i from 1 through $grid-columns {
       // Sizing (percentage)
       .#{$-zf-size}-#{$i} {
-        @include zf-cell-nonresponsive($i, false);
+        @include zf-cell-static($i, false, $gutter-type: padding);
       }
     }
   }
@@ -65,48 +65,48 @@
 
     // Base cell styles
     > .cell {
-      @include zf-cell-nonresponsive($vertical: $vertical);
+      @include zf-cell-static($vertical: $vertical);
     }
 
     // Auto width
     @include -zf-each-breakpoint(false) {
       @if(type-of($grid-margin-gutters) == 'map' and map-has-key($grid-margin-gutters, $-zf-size)) {
         > .cell {
-          @include zf-cell-nonresponsive($breakpoint: $-zf-size, $vertical: $vertical);
+          @include zf-cell-static($breakpoint: $-zf-size, $vertical: $vertical);
         }
         > .auto {
-          @include zf-cell-nonresponsive(auto, false, $breakpoint: $-zf-size, $vertical: $vertical);
+          @include zf-cell-static(auto, false, $breakpoint: $-zf-size, $vertical: $vertical);
         }
         > .shrink {
-          @include zf-cell-nonresponsive(shrink, false, $breakpoint: $-zf-size, $vertical: $vertical);
+          @include zf-cell-static(shrink, false, $breakpoint: $-zf-size, $vertical: $vertical);
         }
       }
       > .#{$-zf-size}-auto {
-        @include zf-cell-nonresponsive(auto, false, $breakpoint: $-zf-size, $vertical: $vertical);
+        @include zf-cell-static(auto, false, $breakpoint: $-zf-size, $vertical: $vertical);
       }
       > .#{$-zf-size}-shrink {
-        @include zf-cell-nonresponsive(shrink, false, $breakpoint: $-zf-size, $vertical: $vertical);
+        @include zf-cell-static(shrink, false, $breakpoint: $-zf-size, $vertical: $vertical);
       }
 
       @for $i from 1 through $grid-columns {
         // Sizing (percentage)
         > .#{$-zf-size}-#{$i} {
-          @include zf-cell-nonresponsive($i, false, $breakpoint: $-zf-size, $vertical: $vertical);
+          @include zf-cell-static($i, false, $breakpoint: $-zf-size, $vertical: $vertical);
         }
       }
       @if(type-of($grid-margin-gutters) == 'map' and map-has-key($grid-margin-gutters, $-zf-size)) {
         @each $bp in -zf-breakpoints-less-than($-zf-size) {
           @if(map-has-key($grid-margin-gutters, $bp)) {
             > .#{$bp}-auto {
-              @include zf-cell-nonresponsive(auto, false, $breakpoint: $bp, $vertical: $vertical);
+              @include zf-cell-static(auto, false, $breakpoint: $bp, $vertical: $vertical);
             }
             > .#{$bp}-shrink {
-              @include zf-cell-nonresponsive(shrink, false, $breakpoint: $bp, $vertical: $vertical);
+              @include zf-cell-static(shrink, false, $breakpoint: $bp, $vertical: $vertical);
             }
             @for $i from 1 through $grid-columns {
               // Sizing (percentage)
               > .#{$bp}-#{$i} {
-                @include zf-cell-nonresponsive($i, false, $breakpoint: $bp, $vertical: $vertical);
+                @include zf-cell-static($i, false, $breakpoint: $bp, $vertical: $vertical);
               }
             }
           }
@@ -116,7 +116,7 @@
       @for $i from 1 through $grid-columns {
         // Sizing (percentage)
         > .#{$-zf-size}-#{$i} {
-          @include zf-cell-nonresponsive($i, false, $breakpoint: $-zf-size, $vertical: $vertical);
+          @include zf-cell-static($i, false, $breakpoint: $-zf-size, $vertical: $vertical);
         }
       }
     }
@@ -183,19 +183,19 @@
     @include -zf-each-breakpoint() {
       @if(type-of($grid-margin-gutters) == 'map' and map-has-key($grid-margin-gutters, $-zf-size)) {
         > .cell {
-          @include zf-cell-nonresponsive($breakpoint: $-zf-size, $vertical: true);
+          @include zf-cell-static($breakpoint: $-zf-size, $vertical: true);
         }
         > .auto {
-          @include zf-cell-nonresponsive(auto, false, $breakpoint: $-zf-size, $vertical: true);
+          @include zf-cell-static(auto, false, $breakpoint: $-zf-size, $vertical: true);
         }
         > .shrink {
-          @include zf-cell-nonresponsive(shrink, false, $breakpoint: $-zf-size, $vertical: true);
+          @include zf-cell-static(shrink, false, $breakpoint: $-zf-size, $vertical: true);
         }
       }
       @for $i from 1 through $grid-columns {
         // Sizing (percentage)
         .#{$-zf-size}-#{$i} {
-          @include zf-cell-nonresponsive($i, false, $vertical: true);
+          @include zf-cell-static($i, false, $vertical: true);
         }
       }
     }

diff --git a/scss/zf-grid/_collapse.scss b/scss/zf-grid/_collapse.scss
index e5a3990c0c29d4d5c9ebbd5c3a151a3d5f4ecfe5..53a951a2304aa5744f8f7ad99fec91087625ea92 100644 (file)
--- a/scss/zf-grid/_collapse.scss
+++ b/scss/zf-grid/_collapse.scss
@@ -22,18 +22,20 @@
 
     @each $value in $gutter-position {
       margin-#{$value}: 0;
+    }
 
       > #{$selector} {
-        margin-#{$value}: 0;
+        @each $value in $gutter-position {
+          margin-#{$value}: 0;
+        }
       }
-    }
 
     // Output new widths to not include gutters
     @each $bp in $breakpoint-classes {
       @for $i from 1 through $grid-columns {
         // Sizing (percentage)
         > .#{$bp}-#{$i} {
-          @include zf-cell-nonresponsive($i, $gutter-output: false, $gutter-type: padding);
+          @include zf-cell-static($i, $gutter-output: false, $gutter-type: padding);
         }
       }
     }
@@ -42,19 +44,11 @@
 
     @each $value in $gutter-position {
       margin-#{$value}: 0;
-
-      > #{$selector} {
-        padding-#{$value}: 0;
-      }
     }
 
-    // Output new widths to not include gutters
-    @each $bp in $breakpoint-classes {
-      @for $i from 1 through $grid-columns {
-        // Sizing (percentage)
-        > .#{$bp}-#{$i} {
-          @include zf-cell-nonresponsive($i, $gutter-output: false, $gutter-type: padding);
-        }
+    > #{$selector} {
+      @each $value in $gutter-position {
+        padding-#{$value}: 0;
       }
     }
   }