From: Aaron Arney <ocularrhythm@users.noreply.github.com>
Date: Mon, 14 Dec 2015 22:26:52 +0000 (-0500)
Subject: Issue #7498 Remove !global flag from $grid-column-count
X-Git-Tag: v6.0.6~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7538%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Issue #7498 Remove !global flag from $grid-column-count

Creating a custom row size using the grid-row mixin was not properly generating the correct CSS. Removing the !global flag from the $grid-column-count in the grid-context mixin seems to correct this.

Tested using following scss. The first list generates a row 17 columns wide, while the second list generates the default 12
ul.one
  @include grid-row(17)
  li
    @include grid-column(1)

ul.two
  li
    @include grid-column(1)
---

diff --git a/scss/grid/_row.scss b/scss/grid/_row.scss
index 25e768e86..3f0aa3bf2 100644
--- a/scss/grid/_row.scss
+++ b/scss/grid/_row.scss
@@ -29,7 +29,7 @@
   }
 
   // Restore the old column count
-  $grid-column-count: $old-grid-column-count !global;
+  $grid-column-count: $old-grid-column-count;
 }
 
 /// Creates a grid row.