From: Geoff Kimball <geoff@zurb.com>
Date: Mon, 23 Nov 2015 18:13:17 +0000 (-0800)
Subject: Resolve merge conflicts in pull request #7131
X-Git-Tag: v6.0.4~19^2~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54f76ad12b69d854e6e9974c7c27db12dd3257d8;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Resolve merge conflicts in pull request #7131
---

54f76ad12b69d854e6e9974c7c27db12dd3257d8
diff --cc scss/grid/_column.scss
index 7b50df572,009176f54..abf272cec
--- a/scss/grid/_column.scss
+++ b/scss/grid/_column.scss
@@@ -12,9 -12,9 +12,9 @@@
  ///   Width of the column. Accepts multiple values:
  ///   - A percentage value will make the column that exact size.
  ///   - A single digit will make the column span that number of columns wide, taking into account the column count of the parent row.
- ///   - A string of the format "x of y" will make a column that is *x* columns wide, assuming *y* total columns for the parent.
+ ///   - A string of the format “x of y” will make a column that is *x* columns wide, assuming *y* total columns for the parent.
  ///
 -/// @return {Number} A calculated percentage value.
 +/// @returns {Number} A calculated percentage value.
  @function grid-column($columns) {
    $width: 0%;
  
diff --cc scss/util/_breakpoint.scss
index 524ba9753,38fb6218f..f7e22b649
--- a/scss/util/_breakpoint.scss
+++ b/scss/util/_breakpoint.scss
@@@ -186,8 -180,3 +186,8 @@@ $breakpoint-classes: (small medium larg
      @return nth($values, $i);
    }
  }
 +
 +// These styles are applied to <meta> tags, which are read by the Foundation JavaScript
 +.foundation-mq {
-   font-family: "#{-zf-bp-serialize($breakpoints)}";
++  font-family: '#{-zf-bp-serialize($breakpoints)}';
 +}