From: Kevin Ball <kmball11@gmail.com>
Date: Tue, 1 Aug 2017 17:19:38 +0000 (-0700)
Subject: More correct fix
X-Git-Tag: v6.4.2-rc2~1^2~2^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c43b520ec2ae088987916a7abc9636bb59828e8;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

More correct fix
---

diff --git a/scss/util/_breakpoint.scss b/scss/util/_breakpoint.scss
index c8562ba58..ce529ffc3 100644
--- a/scss/util/_breakpoint.scss
+++ b/scss/util/_breakpoint.scss
@@ -145,7 +145,9 @@ $breakpoint-classes: (small medium large) !default;
   $pbp: index($-zf-breakpoints-keys, $print-breakpoint);
 
   // Make breakpoint size available as a variable
-  $old-zf-size: $-zf-size;
+  @if global-variable-exists(-zf-size) {
+    $old-zf-size: $-zf-size;
+  }
   $-zf-size: nth($value, 1) !global; // get the first value to account for `only` and `down` keywords
 
   // If $str is still an empty string, no media query is needed
@@ -168,8 +170,10 @@ $breakpoint-classes: (small medium large) !default;
     }
   }
 
-  // Restore the old breakpoint size
-  $-zf-size: $old-zf-size !global;
+  @if variable-exists(old-zf-size) {
+    // Restore the old breakpoint size
+    $-zf-size: $old-zf-size !global;
+  }
 }
 
 /// Convers the breakpoints map to a URL-encoded string, like this: `key1=value1&key2=value2`. The value is then dropped into the CSS for a special `<meta>` tag, which is read by the Foundation JavaScript. This is how we transfer values from Sass to JavaScript, so they can be defined in one place.