diff --git a/sass/forms/_buttons.scss b/sass/forms/_buttons.scss index cdd89c32..ba8aae2f 100644 --- a/sass/forms/_buttons.scss +++ b/sass/forms/_buttons.scss @@ -7,9 +7,7 @@ input[type="submit"] { border-radius: 3px; background: $color__background-button; color: rgba(0, 0, 0, 0.8); - - @include font-size(0.75); - + font-size: 0.75rem; line-height: 1; padding: 0.6em 1em 0.4em; diff --git a/sass/mixins/_mixins-master.scss b/sass/mixins/_mixins-master.scss index 41155be0..860eefe8 100644 --- a/sass/mixins/_mixins-master.scss +++ b/sass/mixins/_mixins-master.scss @@ -1,9 +1,3 @@ -// Rem output with px fallback -@mixin font-size($sizeValue: 1) { - font-size: ($sizeValue * 16) * 1px; - font-size: $sizeValue * 1rem; -} - // Center block @mixin center-block { display: block; diff --git a/sass/modules/_accessibility.scss b/sass/modules/_accessibility.scss index b93d15bd..72326162 100644 --- a/sass/modules/_accessibility.scss +++ b/sass/modules/_accessibility.scss @@ -19,9 +19,7 @@ clip-path: none; color: $color__text-screen; display: block; - - @include font-size(0.875); - + font-size: 0.875rem; font-weight: 700; height: auto; left: 5px; diff --git a/sass/typography/_copy.scss b/sass/typography/_copy.scss index 31b11f4d..5633bd03 100644 --- a/sass/typography/_copy.scss +++ b/sass/typography/_copy.scss @@ -20,8 +20,7 @@ address { pre { background: $color__background-pre; font-family: $font__pre; - - @include font-size(0.9375); + font-size: 0.9375rem; line-height: $font__line-height-pre; margin-bottom: 1.6em; max-width: 100%; @@ -34,8 +33,7 @@ kbd, tt, var { font-family: $font__code; - - @include font-size(0.9375); + font-size: 0.9375rem; } abbr, diff --git a/sass/typography/_typography.scss b/sass/typography/_typography.scss index db6f863a..34009a00 100644 --- a/sass/typography/_typography.scss +++ b/sass/typography/_typography.scss @@ -6,8 +6,7 @@ optgroup, textarea { color: $color__text-main; font-family: $font__main; - - @include font-size(1); + font-size: 1rem; line-height: $font__line-height-body; } diff --git a/style-rtl.css b/style-rtl.css index a1484cb9..c1d7a0f1 100644 --- a/style-rtl.css +++ b/style-rtl.css @@ -368,7 +368,6 @@ optgroup, textarea { color: #404040; font-family: sans-serif; - font-size: 16px; font-size: 1rem; line-height: 1.5; } @@ -404,7 +403,6 @@ address { pre { background: #eee; font-family: "Courier 10 Pitch", courier, monospace; - font-size: 15px; font-size: 0.9375rem; line-height: 1.6; margin-bottom: 1.6em; @@ -418,7 +416,6 @@ kbd, tt, var { font-family: monaco, consolas, "Andale Mono", "DejaVu Sans Mono", monospace; - font-size: 15px; font-size: 0.9375rem; } @@ -518,7 +515,6 @@ input[type="submit"] { border-radius: 3px; background: #e6e6e6; color: rgba(0, 0, 0, 0.8); - font-size: 12px; font-size: 0.75rem; line-height: 1; padding: 0.6em 1em 0.4em; @@ -744,7 +740,6 @@ a:active { clip-path: none; color: #21759b; display: block; - font-size: 14px; font-size: 0.875rem; font-weight: 700; height: auto; diff --git a/style.css b/style.css index 22c5bb0e..330caca3 100644 --- a/style.css +++ b/style.css @@ -368,7 +368,6 @@ optgroup, textarea { color: #404040; font-family: sans-serif; - font-size: 16px; font-size: 1rem; line-height: 1.5; } @@ -404,7 +403,6 @@ address { pre { background: #eee; font-family: "Courier 10 Pitch", courier, monospace; - font-size: 15px; font-size: 0.9375rem; line-height: 1.6; margin-bottom: 1.6em; @@ -418,7 +416,6 @@ kbd, tt, var { font-family: monaco, consolas, "Andale Mono", "DejaVu Sans Mono", monospace; - font-size: 15px; font-size: 0.9375rem; } @@ -518,7 +515,6 @@ input[type="submit"] { border-radius: 3px; background: #e6e6e6; color: rgba(0, 0, 0, 0.8); - font-size: 12px; font-size: 0.75rem; line-height: 1; padding: 0.6em 1em 0.4em; @@ -744,7 +740,6 @@ a:active { clip-path: none; color: #21759b; display: block; - font-size: 14px; font-size: 0.875rem; font-weight: 700; height: auto;