]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
When converting breakpoints to ems, always use a 16px base
authorGeoff Kimball <geoff@zurb.com>
Wed, 16 Dec 2015 19:30:33 +0000 (11:30 -0800)
committerGeoff Kimball <geoff@zurb.com>
Wed, 16 Dec 2015 19:30:33 +0000 (11:30 -0800)
scss/_global.scss
scss/util/_unit.scss

index fdc65081b3ebad30f0ac72440b711a232285fc7d..34053d175da80682e12b8eefe6a185261e399138 100644 (file)
@@ -118,8 +118,7 @@ $foundation-colors: (
     font-family: '#{-zf-bp-serialize($breakpoints)}';
   }
 
-  html,
-  body {
+  html {
     font-size: $global-font-size;
     box-sizing: border-box;
   }
index 1193add21a91c7e07819e6429bc6c06c9dc96096..245b572f37e5ea26d4a36882826c3d6978f7b7aa 100644 (file)
@@ -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