From: Zé Cipriano <ze@zecipriano.com>
Date: Tue, 1 Dec 2015 11:07:07 +0000 (+0000)
Subject: Fix grid-context mixin
X-Git-Tag: v6.0.5~8^2~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f3690d9833993beccb3f96351280c7592cd1636;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Fix grid-context mixin

Store the correct value in $old-grid-column-count so it can be restored
later.

As it was, everytime the grid-context mixin was called, the global value
of $grid-column-count would change to the value of the $columns
parameter.
---

diff --git a/scss/grid/_row.scss b/scss/grid/_row.scss
index 5b1f25397..25e768e86 100644
--- a/scss/grid/_row.scss
+++ b/scss/grid/_row.scss
@@ -18,7 +18,7 @@
   $root: false
 ) {
   // Store the current column count so it can be re-set later
-  $old-grid-column-count: $columns;
+  $old-grid-column-count: $grid-column-count;
   $grid-column-count: $columns !global;
 
   @if $root {