From 0966bff5d317f661b0ead9a555834048886d173a Mon Sep 17 00:00:00 2001
From: Kevin Ball <kmball11@gmail.com>
Date: Wed, 19 Jul 2017 14:53:32 -0700
Subject: [PATCH] Pass on further grid frame margin work

---
 scss/xy-grid/_classes.scss |  3 +++
 scss/xy-grid/_frame.scss   | 49 ++++++++++++++++++++++----------------
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/scss/xy-grid/_classes.scss b/scss/xy-grid/_classes.scss
index 5b296c749..7a7c44fba 100644
--- a/scss/xy-grid/_classes.scss
+++ b/scss/xy-grid/_classes.scss
@@ -333,6 +333,9 @@
 
   @if $margin-grid {
     @include xy-margin-grid-classes(top bottom, true, '.grid-margin-y')
+    .grid-frame.grid-margin-y {
+      @include xy-grid-frame(true, false, $grid-margin-gutters)
+    }
   }
 }
 
diff --git a/scss/xy-grid/_frame.scss b/scss/xy-grid/_frame.scss
index 21d5daecd..a9b4f78aa 100644
--- a/scss/xy-grid/_frame.scss
+++ b/scss/xy-grid/_frame.scss
@@ -8,31 +8,38 @@
   $gutters: null,
   $breakpoint: null
 ) {
-  // Get our gutters if applicable
-  $gutter: -zf-get-bp-val($gutters, $breakpoint);
 
-  // If we have a gutter, add it to the width/height
-  @if $gutter {
-    @if $vertical == true {
-      $unit: if($nested == true, 100%, 100vh);
-      height: calc(#{$unit} + #{$gutter});
-    } @else {
-      $unit: if($nested == true, 100%, 100vw);
-      width: calc(#{$unit} + #{$gutter});
+  @if $breakpoint == null and type-of($gutters) == 'map' {
+    @include -zf-each-breakpoint() {
+      @include xy-grid-frame($vertical, $nested, $gutters, $-zf-size);
     }
-  }
-  @else {
-    @if $vertical == true {
-      height: if($nested == true, 100%, 100vh);
-    } @else {
-      width: if($nested == true, 100%, 100vw);
+  } @else {
+    // Get our gutters if applicable
+    $gutter: -zf-get-bp-val($gutters, $breakpoint);
+
+    // If we have a gutter, add it to the width/height
+    @if $gutter {
+      @if $vertical == true {
+        $unit: if($nested == true, 100%, 100vh);
+        height: calc(#{$unit} + #{$gutter});
+      } @else {
+        $unit: if($nested == true, 100%, 100vw);
+        width: calc(#{$unit} + #{$gutter});
+      }
+    }
+    @else {
+      @if $vertical == true {
+        height: if($nested == true, 100%, 100vh);
+      } @else {
+        width: if($nested == true, 100%, 100vw);
+      }
     }
-  }
 
-  overflow: hidden;
-  position: relative;
-  flex-wrap: nowrap;
-  align-items: stretch;
+    overflow: hidden;
+    position: relative;
+    flex-wrap: nowrap;
+    align-items: stretch;
+  }
 }
 
 /// Modifies a cell to give it "block" behavior (overflow auto, inertial scrolling)
-- 
2.47.3