From: Lonewolf <nikhilkalige@gmail.com>
Date: Fri, 14 Mar 2014 20:06:24 +0000 (+0530)
Subject: Made column-gutter a global variable
X-Git-Tag: v5.2.2~92^2~16^2~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F4686%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Made column-gutter a global variable
---

diff --git a/scss/foundation/_settings.scss b/scss/foundation/_settings.scss
index 07f7512b1..2e62c2fb0 100644
--- a/scss/foundation/_settings.scss
+++ b/scss/foundation/_settings.scss
@@ -36,7 +36,6 @@
 // $include-xl-html-grid-classes: false;
 
 // $row-width: rem-calc(1000);
-// $column-gutter: rem-calc(30);
 // $total-columns: 12;
 
 // We use these to control various global styles
@@ -71,6 +70,8 @@
 // $shiny-edge-color: rgba(#fff, .5);
 // $shiny-edge-active-color: rgba(#000, .2);
 
+// $column-gutter: rem-calc(30);
+
 // Media Query Ranges
 // $small-range: (0em, 40em);
 // $medium-range: (40.063em, 64em);
diff --git a/scss/foundation/components/_global.scss b/scss/foundation/components/_global.scss
index ffbcfa87c..e4c26d154 100644
--- a/scss/foundation/components/_global.scss
+++ b/scss/foundation/components/_global.scss
@@ -250,6 +250,7 @@ $include-html-classes: true !default;
 $include-print-styles: true !default;
 $include-html-global-classes: $include-html-classes !default;
 
+$column-gutter: rem-calc(30) !default;
 
 // Media Query Ranges
 $small-range: (0em, 40em) !default;
diff --git a/scss/foundation/components/_grid.scss b/scss/foundation/components/_grid.scss
index eb9c959af..de65c89de 100644
--- a/scss/foundation/components/_grid.scss
+++ b/scss/foundation/components/_grid.scss
@@ -11,7 +11,6 @@ $include-html-grid-classes: $include-html-classes !default;
 $include-xl-html-grid-classes: false !default;
 
 $row-width: rem-calc(1000) !default;
-$column-gutter: rem-calc(30) !default;
 $total-columns: 12 !default;
 
 //
@@ -37,7 +36,7 @@ $total-columns: 12 !default;
 
 // For creating container, nested, and collapsed rows.
 //
-// 
+//
 // $behavior - Any special behavior for this row? Default: false. Options: nest, collapse, nest-collapse, false.
 @mixin grid-row($behavior: false) {
 
@@ -90,13 +89,13 @@ $total-columns: 12 !default;
 // $collapse - Get rid of gutter padding on column? Default: false.
 // $float - Should this float? Default: true. Options: true, false, left, right.
 @mixin grid-column(
-  $columns:false, 
-  $last-column:false, 
-  $center:false, 
-  $offset:false, 
-  $push:false, 
-  $pull:false, 
-  $collapse:false, 
+  $columns:false,
+  $last-column:false,
+  $center:false,
+  $offset:false,
+  $push:false,
+  $pull:false,
+  $collapse:false,
   $float:true,
   $position:false) {
 
@@ -199,7 +198,7 @@ $total-columns: 12 !default;
     margin-#{$opposite-direction}: 0;
     left: auto;
     right: auto;
-    float: $default-float; 
+    float: $default-float;
   }
 }