Merge pull request #844 from ericam/master

establish relative font size when $relative-font-size
This commit is contained in:
Eric Meyer 2012-04-17 11:42:35 -07:00
commit 1f222fc19f

View File

@ -55,14 +55,16 @@ $base-half-leader: $base-leader / 2;
// Establishes a font baseline for the given font-size. // Establishes a font baseline for the given font-size.
@mixin establish-baseline($font-size: $base-font-size) { @mixin establish-baseline($font-size: $base-font-size) {
// IE 6 refuses to resize fonts set in pixels and it weirdly resizes fonts $relative-size : 100% * ($font-size / $browser-default-font-size);
// whose root is set in ems. So we set the root font size in percentages of
// the default font size. @if $legacy-support-for-ie6 and (not $relative-font-sizing) {
* html { // IE 6 refuses to resize fonts set in pixels and it weirdly resizes fonts
font-size: 100% * ($font-size / $browser-default-font-size); // whose root is set in ems. So we set the root font size in percentages of
// the default font size, even if we are using absolute sizes elsewhere.
* html { font-size: $relative-size; }
} }
html { html {
font-size: $font-size; font-size: if($relative-font-sizing,$relative-size,$font-size);
@include adjust-leading-to(1, if($relative-font-sizing, $font-size, $base-font-size)); @include adjust-leading-to(1, if($relative-font-sizing, $font-size, $base-font-size));
} }
} }