From: Geoff Kimball <geoff@zurb.com>
Date: Wed, 16 Dec 2015 19:30:33 +0000 (-0800)
Subject: When converting breakpoints to ems, always use a 16px base
X-Git-Tag: v6.1.0~38^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d67aa6d6b2fe2e028d4eb6d51e597eff76b0081c;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

When converting breakpoints to ems, always use a 16px base
---

diff --git a/scss/_global.scss b/scss/_global.scss
index fdc65081b..34053d175 100644
--- a/scss/_global.scss
+++ b/scss/_global.scss
@@ -118,8 +118,7 @@ $foundation-colors: (
     font-family: '#{-zf-bp-serialize($breakpoints)}';
   }
 
-  html,
-  body {
+  html {
     font-size: $global-font-size;
     box-sizing: border-box;
   }
diff --git a/scss/util/_unit.scss b/scss/util/_unit.scss
index 1193add21..245b572f3 100644
--- a/scss/util/_unit.scss
+++ b/scss/util/_unit.scss
@@ -52,7 +52,7 @@ $global-font-size: 100% !default;
 @function -zf-bp-to-em($value) {
   // Pixel and unitless values are converted to rems
   @if unit($value) == 'px' or unitless($value) {
-    $value: rem-calc($value);
+    $value: rem-calc($value, $base: 16px);
   }
 
   // Then the value is converted to ems