From: Geoff Kimball <geoff@zurb.com>
Date: Fri, 4 Dec 2015 00:36:17 +0000 (-0800)
Subject: Remove duplicate $global-margin variable... again? Definitely fixes #7197
X-Git-Tag: v6.0.6~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c08c87a01b3689963e03e1149f1a68ed96d3600;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Remove duplicate $global-margin variable... again? Definitely fixes #7197
---

diff --git a/scss/_global.scss b/scss/_global.scss
index bdffc73e2..cf522198a 100644
--- a/scss/_global.scss
+++ b/scss/_global.scss
@@ -82,10 +82,6 @@ $global-margin: 1rem !default;
 /// @type Number
 $global-padding: 1rem !default;
 
-/// Global value used for margin between components.
-/// @type Number
-$global-margin: 1rem !default;
-
 /// Global font weight used for normal type.
 /// @type Keyword | Number
 $global-weight-normal: normal !default;