From 5a7e1f6ed19acf86e3caa21fa96f96cf8fb54616 Mon Sep 17 00:00:00 2001
From: Kevin Ball <kmball11@gmail.com>
Date: Tue, 1 Aug 2017 12:46:32 -0700
Subject: [PATCH] Prevent zf-size leakage

---
 scss/util/_breakpoint.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scss/util/_breakpoint.scss b/scss/util/_breakpoint.scss
index ce529ffc3..dbfae8c4b 100644
--- a/scss/util/_breakpoint.scss
+++ b/scss/util/_breakpoint.scss
@@ -144,6 +144,8 @@ $breakpoint-classes: (small medium large) !default;
   $bp: index($-zf-breakpoints-keys, $value);
   $pbp: index($-zf-breakpoints-keys, $print-breakpoint);
 
+  $old-zf-size: null;
+
   // Make breakpoint size available as a variable
   @if global-variable-exists(-zf-size) {
     $old-zf-size: $-zf-size;
@@ -170,9 +172,11 @@ $breakpoint-classes: (small medium large) !default;
     }
   }
 
-  @if variable-exists(old-zf-size) {
+  @if $old-zf-size != null {
     // Restore the old breakpoint size
     $-zf-size: $old-zf-size !global;
+  } @else {
+    $-zf-size: null !global;
   }
 }
 
-- 
2.47.2