Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/JohnAlbin/normalize-scss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/sass
diff options
context:
space:
mode:
authorJohnAlbin <virtually.johnalbin@gmail.com>2017-05-07 15:20:04 +0300
committerJohnAlbin <virtually.johnalbin@gmail.com>2017-05-10 16:44:44 +0300
commit38f8b3fc29ff97cd3dd78d79a8f7f92f2fb9817e (patch)
treef0d42a254b27102d979545f17ad0915619671666 /sass
parent52fdb1a1d882b7bc462c81151ab70077d47421a3 (diff)
Remove opinionated font-family rule on html element.
Diffstat (limited to 'sass')
-rw-r--r--sass/normalize/_normalize-mixin.scss20
-rw-r--r--sass/normalize/_variables.scss2
2 files changed, 12 insertions, 10 deletions
diff --git a/sass/normalize/_normalize-mixin.scss b/sass/normalize/_normalize-mixin.scss
index f0aaef2..e8f4e9b 100644
--- a/sass/normalize/_normalize-mixin.scss
+++ b/sass/normalize/_normalize-mixin.scss
@@ -48,27 +48,29 @@
========================================================================== */
/**
- * 1. Change the default font family in all browsers (opinionated).
- * 2. Correct the line height in all browsers.
- * 3. Prevent adjustments of font size after orientation changes in
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in
* IE on Windows Phone and in iOS.
*/
html {
- font-family: $base-font-family; /* 1 */
+ @if $base-font-family {
+ /* Change the default font family in all browsers (opinionated). */
+ font-family: $base-font-family;
+ }
@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 */
+ line-height: ($base-line-height / $base-font-size) * 1em; /* 1 */
}
@else {
- line-height: 1.15; /* 2 */
+ line-height: 1.15; /* 1 */
}
- -ms-text-size-adjust: 100%; /* 3 */
- -webkit-text-size-adjust: 100%; /* 3 */
+ -ms-text-size-adjust: 100%; /* 2 */
+ -webkit-text-size-adjust: 100%; /* 2 */
}
}
@@ -424,7 +426,7 @@
optgroup,
select,
textarea {
- font-family: $base-font-family; /* 1 */
+ font-family: if($base-font-family, $base-font-family, sans-serif); /* 1 */
font-size: 100%; /* 1 */
@if $normalize-vertical-rhythm {
line-height: ($base-line-height / $base-font-size) * 1em; /* 1 */
diff --git a/sass/normalize/_variables.scss b/sass/normalize/_variables.scss
index 2f06b25..10d05ed 100644
--- a/sass/normalize/_variables.scss
+++ b/sass/normalize/_variables.scss
@@ -15,7 +15,7 @@ $base-line-height: 24px !default;
$base-unit: 'em' !default;
// The default font family.
-$base-font-family: sans-serif !default;
+$base-font-family: null !default;
// The font sizes for h1-h6.
$h1-font-size: 2 * $base-font-size !default;