From 47a9de954475dd769b2ce0504f31063de25f4bb8 Mon Sep 17 00:00:00 2001
From: Brett Mason <brettsmason@gmail.com>
Date: Mon, 29 May 2017 08:27:06 +0100
Subject: [PATCH] Rename all `auto/shrink` classes so they are always prefixed
 with [size] (even at small). Clean up vertical grid by removing
 `.vertical-grid` prefix as its not needed other than for cells.

---
 scss/zf-grid/_classes.scss | 33 +++++----------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/scss/zf-grid/_classes.scss b/scss/zf-grid/_classes.scss
index 42aa4219e..03ded7c27 100644
--- a/scss/zf-grid/_classes.scss
+++ b/scss/zf-grid/_classes.scss
@@ -24,11 +24,11 @@
   }
 
   .grid {
-    > .auto {
+    > .small-auto {
       @include zf-cell-base(auto);
     }
 
-    > .shrink {
+    > .small-shrink {
       @include zf-cell-base(shrink);
     }
   }
@@ -92,29 +92,6 @@
           @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-static(auto, false, $breakpoint: $bp, $vertical: $vertical);
-            }
-
-            > .#{$bp}-shrink {
-              @include zf-cell-static(shrink, false, $breakpoint: $bp, $vertical: $vertical);
-            }
-
-            @for $i from 1 through $grid-columns {
-              // Sizing (percentage)
-              $classname: if($vertical, '.#{$bp}-vertical-#{$i}', '.#{$bp}-#{$i}');
-
-              > #{$classname} {
-                @include zf-cell-static($i, false, $breakpoint: $bp, $vertical: $vertical);
-              }
-            }
-          }
-        }
-      }
     }
   }
 }
@@ -184,11 +161,11 @@
           @include zf-cell-static($breakpoint: $-zf-size, $vertical: true);
         }
 
-        > .auto {
+        > .#{$-zf-size}-auto {
           @include zf-cell-static(auto, false, $breakpoint: $-zf-size, $vertical: true);
         }
 
-        > .shrink {
+        > .#{$-zf-size}-shrink {
           @include zf-cell-static(shrink, false, $breakpoint: $-zf-size, $vertical: true);
         }
       }
@@ -214,7 +191,7 @@
     }
   }
 
-  @include zf-margin-grid-classes(top bottom, true, '.grid-vertical.margin-gutters')
+  @include zf-margin-grid-classes(top bottom, true, '.margin-gutters')
 }
 
 // Final classes
-- 
2.47.3