Merge pull request #703 from taupecat/upstream-master

Using best practices to apply the proper units to the font-size mixin. See http://sass-guidelin.es/#units
Automattic · Feb 18, 2015 · d5c78ac · d5c78ac
2 parents 70db168 + 0395cd6
commit d5c78ac
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sass/mixins/_mixins-master.scss b/sass/mixins/_mixins-master.scss
@@ -1,7 +1,7 @@
 // Rem output with px fallback
 @mixin font-size($sizeValue: 1) {
-	font-size: ($sizeValue * 16) + px;
-	font-size: $sizeValue + rem;
+	font-size: ($sizeValue * 16) * 1px;
+	font-size: $sizeValue * 1rem;
 }
 
 // Center block