Skip to content

Commit

Permalink
style: Fix rem computation on the root element.
Browse files Browse the repository at this point in the history
Bug: 1375930
Reviewed-By: heycam
MozReview-Commit-ID: DK98SS1w5nO
  • Loading branch information
emilio committed Jun 25, 2017
1 parent 946c9ae commit 6f57a9b
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions components/style/values/specified/length.rs
Expand Up @@ -112,7 +112,6 @@ impl FontRelativeLength {

let reference_font_size = base_size.resolve(context);

let root_font_size = context.device.root_font_size();
match *self {
FontRelativeLength::Em(length) => reference_font_size.scale_by(length),
FontRelativeLength::Ex(length) => {
Expand Down Expand Up @@ -149,7 +148,19 @@ impl FontRelativeLength {
}
}
}
FontRelativeLength::Rem(length) => root_font_size.scale_by(length)
FontRelativeLength::Rem(length) => {
// https://drafts.csswg.org/css-values/#rem:
//
// When specified on the font-size property of the root
// element, the rem units refer to the property’s initial
// value.
//
if context.is_root_element {
reference_font_size.scale_by(length)
} else {
context.device.root_font_size().scale_by(length)
}
}
}
}
}
Expand Down

0 comments on commit 6f57a9b

Please sign in to comment.