From: Alan Dague-Greene <alan@basicrecipe.com>
Date: Fri, 7 Mar 2014 00:40:15 +0000 (-0700)
Subject: Allow default value for block grid alignment
X-Git-Tag: v5.2.1~8^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F4616%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Allow default value for block grid alignment

Adds block grid alignment setting to _settings.scss, for consistency
with other block grid variables.
---

diff --git a/scss/foundation/_settings.scss b/scss/foundation/_settings.scss
index bc71ae993..4b73ec9e3 100644
--- a/scss/foundation/_settings.scss
+++ b/scss/foundation/_settings.scss
@@ -275,6 +275,7 @@
 // We use this to control the maximum number of block grid elements per row
 // $block-grid-elements: 12;
 // $block-grid-default-spacing: rem-calc(20);
+// $align-block-grid-to-grid: true;
 
 // Enables media queries for block-grid classes. Set to false if writing semantic HTML.
 // $block-grid-media-queries: true;
diff --git a/scss/foundation/components/_block-grid.scss b/scss/foundation/components/_block-grid.scss
index d5ba82444..2031b8580 100644
--- a/scss/foundation/components/_block-grid.scss
+++ b/scss/foundation/components/_block-grid.scss
@@ -13,7 +13,7 @@ $include-html-grid-classes: $include-html-classes !default;
 $block-grid-elements: 12 !default;
 $block-grid-default-spacing: rem-calc(20) !default;
 
-$align-block-grid-to-grid: true;
+$align-block-grid-to-grid: true !default;
 @if $align-block-grid-to-grid {
   $block-grid-default-spacing: $column-gutter;
 }