From 18de15a157902d641dcc981d5ca20fe82da95f09 Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Wed, 11 Apr 2012 15:49:41 -0600 Subject: [PATCH] establish relative font-size when $relative-font-sizing == true --- .../compass/typography/_vertical_rhythm.scss | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss b/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss index 6184c03b..6fe1672e 100644 --- a/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss +++ b/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss @@ -55,14 +55,16 @@ $base-half-leader: $base-leader / 2; // Establishes a font baseline for the given font-size. @mixin establish-baseline($font-size: $base-font-size) { - // IE 6 refuses to resize fonts set in pixels and it weirdly resizes fonts - // whose root is set in ems. So we set the root font size in percentages of - // the default font size. - * html { - font-size: 100% * ($font-size / $browser-default-font-size); + $relative-size : 100% * ($font-size / $browser-default-font-size); + + @if $legacy-support-for-ie6 and (not $relative-font-sizing) { + // IE 6 refuses to resize fonts set in pixels and it weirdly resizes fonts + // 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 { - 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)); } }