diff options
| author | JohnAlbin <virtually.johnalbin@gmail.com> | 2017-05-07 05:59:19 +0300 |
|---|---|---|
| committer | JohnAlbin <virtually.johnalbin@gmail.com> | 2017-05-07 05:59:19 +0300 |
| commit | a695a65f8011d80ca18189f1ac9470b4b773028f (patch) | |
| tree | ba203f22880f053de7cdfa8b6c9316260a31fecd | |
| parent | 42149bcf0a92f3a3e0abaf594cec620e95adbc02 (diff) | |
Prevent unnecessary $normalize-vertical-rhythm usage. Fixes #97
| -rw-r--r-- | sass/normalize/_normalize-mixin.scss | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sass/normalize/_normalize-mixin.scss b/sass/normalize/_normalize-mixin.scss index 70a8d3d..f0aaef2 100644 --- a/sass/normalize/_normalize-mixin.scss +++ b/sass/normalize/_normalize-mixin.scss @@ -31,10 +31,8 @@ $init: _normalize-include($include, $exclude); // If we've customized any font variables, we'll need extra properties. - @if $base-font-size != 16px - or $base-line-height != 24px + @if $base-line-height != 24px or $base-unit != 'em' - or $h1-font-size != 2 * $base-font-size or $h2-font-size != 1.5 * $base-font-size or $h3-font-size != 1.17 * $base-font-size or $h4-font-size != 1 * $base-font-size @@ -58,10 +56,12 @@ html { font-family: $base-font-family; /* 1 */ - @if $normalize-vertical-rhythm { + @if $base-font-size != 16px or $normalize-vertical-rhythm { // Correct old browser bug that prevented accessible resizing of text // when root font-size is set with px or em. font-size: ($base-font-size / 16px) * 100%; + } + @if $normalize-vertical-rhythm { line-height: ($base-line-height / $base-font-size) * 1em; /* 2 */ } @else { |