diff options
author | JohnAlbin <virtually.johnalbin@gmail.com> | 2017-05-15 07:43:47 +0300 |
---|---|---|
committer | JohnAlbin <virtually.johnalbin@gmail.com> | 2017-05-15 07:43:47 +0300 |
commit | 17ee958aad61678daac3b1f226eb72d2e37d0d52 (patch) | |
tree | 6cb124a822838a351482b9cd8c8e58cc1a15fd87 | |
parent | 52fdb1a1d882b7bc462c81151ab70077d47421a3 (diff) | |
parent | 9e5bee421e47747ebaf568d7a41560afba1961d2 (diff) |
Upgrade to normalize 7.0.0. Fixes #107
22 files changed, 119 insertions, 296 deletions
diff --git a/fork-versions/default/_normalize.scss b/fork-versions/default/_normalize.scss index aafaa74..30c5969 100644 --- a/fork-versions/default/_normalize.scss +++ b/fork-versions/default/_normalize.scss @@ -19,14 +19,16 @@ ========================================================================== */ /** - * 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. @@ -35,13 +37,13 @@ html { @if $normalize-vertical-rhythm { // Establish a vertical rhythm unit using $base-font-size and // $base-line-height variables. - 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 */ } /* Sections @@ -239,21 +241,11 @@ a { -webkit-text-decoration-skip: objects; /* 2 */ } -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ - -a:active, -a:hover { - outline-width: 0; -} - /* Text-level semantics ========================================================================== */ /** - * 1. Remove the bottom border in Firefox 39-. + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ @@ -418,7 +410,7 @@ textarea { @else { line-height: 1.15; /* 1 */ } - font-family: $base-font-family; /* 1 */ + font-family: if($base-font-family, $base-font-family, sans-serif); /* 1 */ font-size: 100%; /* 1 */ margin: 0; /* 2 */ } @@ -535,13 +527,11 @@ input { } /** - * Change the border, margin, and padding in all browsers (opinionated). + * Correct the padding in Firefox. */ fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; + padding: 0.35em 0.75em 0.625em; } /** diff --git a/fork-versions/default/_variables.scss b/fork-versions/default/_variables.scss index a3c28a3..f5bd845 100644 --- a/fork-versions/default/_variables.scss +++ b/fork-versions/default/_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; diff --git a/fork-versions/typey-chroma-kss/base/forms/_forms.scss b/fork-versions/typey-chroma-kss/base/forms/_forms.scss index 3dc5641..8a6fa29 100644 --- a/fork-versions/typey-chroma-kss/base/forms/_forms.scss +++ b/fork-versions/typey-chroma-kss/base/forms/_forms.scss @@ -188,10 +188,9 @@ input { // Style guide: forms.base.fieldset fieldset { - // Change the border, margin, and padding in all browsers (opinionated). - @include padding(.35 .625 .65); + // Correct the padding in Firefox. + @include padding(.35 .5 .65); border: 1px solid color(border); - margin: 0 2px; } legend { diff --git a/fork-versions/typey-chroma-kss/base/links/_links.scss b/fork-versions/typey-chroma-kss/base/links/_links.scss index b77730f..074060b 100644 --- a/fork-versions/typey-chroma-kss/base/links/_links.scss +++ b/fork-versions/typey-chroma-kss/base/links/_links.scss @@ -44,13 +44,6 @@ a:active { } } -// Remove the outline on focused links when they are also active or hovered -// in all browsers (opinionated). -a:active, -a:hover { - outline-width: 0; -} - @media print { // Underline all links. :link, diff --git a/fork-versions/typey-chroma-kss/base/text/_text.scss b/fork-versions/typey-chroma-kss/base/text/_text.scss index b955ce7..8ef729d 100644 --- a/fork-versions/typey-chroma-kss/base/text/_text.scss +++ b/fork-versions/typey-chroma-kss/base/text/_text.scss @@ -16,7 +16,7 @@ // Style guide: base.text.abbr abbr[title] { - // Remove the bottom border in Firefox 39-. + // Remove the bottom border in Chrome 57- and Firefox 39-. border-bottom: 0; // sass-lint:disable no-duplicate-properties // Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. diff --git a/fork-versions/typey/_normalize.scss b/fork-versions/typey/_normalize.scss index 7d3f02c..ede3847 100644 --- a/fork-versions/typey/_normalize.scss +++ b/fork-versions/typey/_normalize.scss @@ -194,21 +194,11 @@ a { -webkit-text-decoration-skip: objects; /* 2 */ } -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ - -a:active, -a:hover { - outline-width: 0; -} - /* Text-level semantics ========================================================================== */ /** - * 1. Remove the bottom border in Firefox 39-. + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ @@ -485,14 +475,13 @@ input { } /** - * Change the border, margin, and padding in all browsers (opinionated). + * Correct the padding in Firefox. */ fieldset { // Apply borders and padding that keep the vertical rhythm. - @include padding(.35 .625 .65); + @include padding(.35 .5 .65); border: 1px solid #c0c0c0; - margin: 0 2px; } /** diff --git a/sass/normalize/_normalize-mixin.scss b/sass/normalize/_normalize-mixin.scss index f0aaef2..a366f7b 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 */ } } @@ -267,16 +269,6 @@ background-color: transparent; /* 1 */ -webkit-text-decoration-skip: objects; /* 2 */ } - - /** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ - - a:active, - a:hover { - outline-width: 0; - } } @if _normalize-include(text) { @@ -284,7 +276,7 @@ ========================================================================== */ /** - * 1. Remove the bottom border in Firefox 39-. + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ @@ -424,7 +416,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 */ @@ -547,13 +539,11 @@ } /** - * Change the border, margin, and padding in all browsers (opinionated). + * Correct the padding in Firefox. */ fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; + padding: 0.35em 0.75em 0.625em; } /** 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; diff --git a/test/fixtures/fork-versions/default/output.css b/test/fixtures/fork-versions/default/output.css index 5c89210..90f518f 100644 --- a/test/fixtures/fork-versions/default/output.css +++ b/test/fixtures/fork-versions/default/output.css @@ -2,20 +2,17 @@ /* Document ========================================================================== */ /** - * 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: sans-serif; - /* 1 */ line-height: 1.15; - /* 2 */ + /* 1 */ -ms-text-size-adjust: 100%; - /* 3 */ + /* 2 */ -webkit-text-size-adjust: 100%; - /* 3 */ } + /* 2 */ } /* Sections ========================================================================== */ @@ -101,18 +98,10 @@ a { -webkit-text-decoration-skip: objects; /* 2 */ } -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ -a:active, -a:hover { - outline-width: 0; } - /* Text-level semantics ========================================================================== */ /** - * 1. Remove the bottom border in Firefox 39-. + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ abbr[title] { @@ -348,12 +337,10 @@ input { /* 2 */ } /** - * Change the border, margin, and padding in all browsers (opinionated). + * Correct the padding in Firefox. */ fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; } + padding: 0.35em 0.75em 0.625em; } /** * 1. Correct the text wrapping in Edge and IE. diff --git a/test/fixtures/fork-versions/typey-chroma-kss/output.css b/test/fixtures/fork-versions/typey-chroma-kss/output.css index 0d23aab..091d0d9 100644 --- a/test/fixtures/fork-versions/typey-chroma-kss/output.css +++ b/test/fixtures/fork-versions/typey-chroma-kss/output.css @@ -127,10 +127,6 @@ a:active { a:active:not(.button) { background-color: transparent; } -a:active, -a:hover { - outline-width: 0; } - @media print { :link, :visited { @@ -316,9 +312,8 @@ button[disabled], padding: 0; } fieldset { - padding: 0.525rem 0.9375rem 0.975rem; - border: 1px solid #cccccc; - margin: 0 2px; } + padding: 0.525rem 0.75rem 0.975rem; + border: 1px solid #cccccc; } legend { box-sizing: border-box; diff --git a/test/fixtures/fork-versions/typey/output.css b/test/fixtures/fork-versions/typey/output.css index 8cc6acf..5515493 100644 --- a/test/fixtures/fork-versions/typey/output.css +++ b/test/fixtures/fork-versions/typey/output.css @@ -167,18 +167,10 @@ a { -webkit-text-decoration-skip: objects; /* 2 */ } -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ -a:active, -a:hover { - outline-width: 0; } - /* Text-level semantics ========================================================================== */ /** - * 1. Remove the bottom border in Firefox 39-. + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ abbr[title] { @@ -414,12 +406,11 @@ input { /* 2 */ } /** - * Change the border, margin, and padding in all browsers (opinionated). + * Correct the padding in Firefox. */ fieldset { - padding: 0.525rem 0.9375rem 0.975rem; - border: 1px solid #c0c0c0; - margin: 0 2px; } + padding: 0.525rem 0.75rem 0.975rem; + border: 1px solid #c0c0c0; } /** * 1. Correct the text wrapping in Edge and IE. diff --git a/test/fixtures/import-now/output.css b/test/fixtures/import-now/output.css index 429af58..d725150 100644 --- a/test/fixtures/import-now/output.css +++ b/test/fixtures/import-now/output.css @@ -2,20 +2,17 @@ /* Document ========================================================================== */ /** - * 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: sans-serif; - /* 1 */ line-height: 1.15; - /* 2 */ + /* 1 */ -ms-text-size-adjust: 100%; - /* 3 */ + /* 2 */ -webkit-text-size-adjust: 100%; - /* 3 */ } + /* 2 */ } /* Sections ========================================================================== */ @@ -99,18 +96,10 @@ a { -webkit-text-decoration-skip: objects; /* 2 */ } -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ -a:active, -a:hover { - outline-width: 0; } - /* Text-level semantics ========================================================================== */ /** - * 1. Remove the bottom border in Firefox 39-. + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ abbr[title] { @@ -330,12 +319,10 @@ input { /* 2 */ } /** - * Change the border, margin, and padding in all browsers (opinionated). + * Correct the padding in Firefox. */ fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; } + padding: 0.35em 0.75em 0.625em; } /** * 1. Correct the text wrapping in Edge and IE. diff --git a/test/fixtures/normalize/exclude-multiple/output.css b/test/fixtures/normalize/exclude-multiple/output.css index bb64a34..ad16984 100644 --- a/test/fixtures/normalize/exclude-multiple/output.css +++ b/test/fixtures/normalize/exclude-multiple/output.css @@ -2,20 +2,17 @@ /* Document ========================================================================== */ /** - * 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: sans-serif; - /* 1 */ line-height: 1.15; - /* 2 */ + /* 1 */ -ms-text-size-adjust: 100%; - /* 3 */ + /* 2 */ -webkit-text-size-adjust: 100%; - /* 3 */ } + /* 2 */ } /* Sections ========================================================================== */ @@ -56,18 +53,10 @@ a { -webkit-text-decoration-skip: objects; /* 2 */ } -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ -a:active, -a:hover { - outline-width: 0; } - /* Text-level semantics ========================================================================== */ /** - * 1. Remove the bottom border in Firefox 39-. + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ abbr[title] { @@ -259,12 +248,10 @@ input { /* 2 */ } /** - * Change the border, margin, and padding in all browsers (opinionated). + * Correct the padding in Firefox. */ fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; } + padding: 0.35em 0.75em 0.625em; } /** * 1. Correct the text wrapping in Edge and IE. diff --git a/test/fixtures/normalize/exclude-single/output.css b/test/fixtures/normalize/exclude-single/output.css index 0034bcb..ec53e8f 100644 --- a/test/fixtures/normalize/exclude-single/output.css +++ b/test/fixtures/normalize/exclude-single/output.css @@ -2,20 +2,17 @@ /* Document ========================================================================== */ /** - * 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: sans-serif; - /* 1 */ line-height: 1.15; - /* 2 */ + /* 1 */ -ms-text-size-adjust: 100%; - /* 3 */ + /* 2 */ -webkit-text-size-adjust: 100%; - /* 3 */ } + /* 2 */ } /* Sections ========================================================================== */ @@ -99,18 +96,10 @@ a { -webkit-text-decoration-skip: objects; /* 2 */ } -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ -a:active, -a:hover { - outline-width: 0; } - /* Text-level semantics ========================================================================== */ /** - * 1. Remove the bottom border in Firefox 39-. + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ abbr[title] { diff --git a/test/fixtures/normalize/exclude-string/output.css b/test/fixtures/normalize/exclude-string/output.css index 4c677fc..c9f897a 100644 --- a/test/fixtures/normalize/exclude-string/output.css +++ b/test/fixtures/normalize/exclude-string/output.css @@ -2,20 +2,17 @@ /* Document ========================================================================== */ /** - * 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: sans-serif; - /* 1 */ line-height: 1.15; - /* 2 */ + /* 1 */ -ms-text-size-adjust: 100%; - /* 3 */ + /* 2 */ -webkit-text-size-adjust: 100%; - /* 3 */ } + /* 2 */ } /* Sections ========================================================================== */ @@ -99,18 +96,10 @@ a { -webkit-text-decoration-skip: objects; /* 2 */ } -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ -a:active, -a:hover { - outline-width: 0; } - /* Text-level semantics ========================================================================== */ /** - * 1. Remove the bottom border in Firefox 39-. + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ abbr[title] { @@ -330,12 +319,10 @@ input { /* 2 */ } /** - * Change the border, margin, and padding in all browsers (opinionated). + * Correct the padding in Firefox. */ fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; } + padding: 0.35em 0.75em 0.625em; } /** * 1. Correct the text wrapping in Edge and IE. diff --git a/test/fixtures/normalize/include-multiple/output.css b/test/fixtures/normalize/include-multiple/output.css index b4008de..f6e4916 100644 --- a/test/fixtures/normalize/include-multiple/output.css +++ b/test/fixtures/normalize/include-multiple/output.css @@ -2,20 +2,17 @@ /* Document ========================================================================== */ /** - * 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: sans-serif; - /* 1 */ line-height: 1.15; - /* 2 */ + /* 1 */ -ms-text-size-adjust: 100%; - /* 3 */ + /* 2 */ -webkit-text-size-adjust: 100%; - /* 3 */ } + /* 2 */ } /* Sections ========================================================================== */ diff --git a/test/fixtures/normalize/include-single/output.css b/test/fixtures/normalize/include-single/output.css index 71978f3..8402199 100644 --- a/test/fixtures/normalize/include-single/output.css +++ b/test/fixtures/normalize/include-single/output.css @@ -10,11 +10,3 @@ a { /* 1 */ -webkit-text-decoration-skip: objects; /* 2 */ } - -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ -a:active, -a:hover { - outline-width: 0; } diff --git a/test/fixtures/normalize/include-string/output.css b/test/fixtures/normalize/include-string/output.css index 48c3f52..6820a40 100644 --- a/test/fixtures/normalize/include-string/output.css +++ b/test/fixtures/normalize/include-string/output.css @@ -2,7 +2,7 @@ /* Text-level semantics ========================================================================== */ /** - * 1. Remove the bottom border in Firefox 39-. + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ abbr[title] { diff --git a/test/fixtures/variables/default/output.css b/test/fixtures/variables/default/output.css index 429af58..d725150 100644 --- a/test/fixtures/variables/default/output.css +++ b/test/fixtures/variables/default/output.css @@ -2,20 +2,17 @@ /* Document ========================================================================== */ /** - * 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: sans-serif; - /* 1 */ line-height: 1.15; - /* 2 */ + /* 1 */ -ms-text-size-adjust: 100%; - /* 3 */ + /* 2 */ -webkit-text-size-adjust: 100%; - /* 3 */ } + /* 2 */ } /* Sections ========================================================================== */ @@ -99,18 +96,10 @@ a { -webkit-text-decoration-skip: objects; /* 2 */ } -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ -a:active, -a:hover { - outline-width: 0; } - /* Text-level semantics ========================================================================== */ /** - * 1. Remove the bottom border in Firefox 39-. + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ abbr[title] { @@ -330,12 +319,10 @@ input { /* 2 */ } /** - * Change the border, margin, and padding in all browsers (opinionated). + * Correct the padding in Firefox. */ fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; } + padding: 0.35em 0.75em 0.625em; } /** * 1. Correct the text wrapping in Edge and IE. diff --git a/test/fixtures/variables/font/output.css b/test/fixtures/variables/font/output.css index 9f42c91..1e95491 100644 --- a/test/fixtures/variables/font/output.css +++ b/test/fixtures/variables/font/output.css @@ -2,21 +2,20 @@ /* Document ========================================================================== */ /** - * 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 { + /* Change the default font family in all browsers (opinionated). */ font-family: Arial, sans-serif; - /* 1 */ font-size: 150%; line-height: 1.5em; - /* 2 */ + /* 1 */ -ms-text-size-adjust: 100%; - /* 3 */ + /* 2 */ -webkit-text-size-adjust: 100%; - /* 3 */ } + /* 2 */ } /* Sections ========================================================================== */ @@ -161,18 +160,10 @@ a { -webkit-text-decoration-skip: objects; /* 2 */ } -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ -a:active, -a:hover { - outline-width: 0; } - /* Text-level semantics ========================================================================== */ /** - * 1. Remove the bottom border in Firefox 39-. + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ abbr[title] { @@ -392,12 +383,10 @@ input { /* 2 */ } /** - * Change the border, margin, and padding in all browsers (opinionated). + * Correct the padding in Firefox. */ fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; } + padding: 0.35em 0.75em 0.625em; } /** * 1. Correct the text wrapping in Edge and IE. diff --git a/test/fixtures/variables/indent-amount-and-vertical-rhythm/output.css b/test/fixtures/variables/indent-amount-and-vertical-rhythm/output.css index 013be00..60a333e 100644 --- a/test/fixtures/variables/indent-amount-and-vertical-rhythm/output.css +++ b/test/fixtures/variables/indent-amount-and-vertical-rhythm/output.css @@ -2,21 +2,18 @@ /* Document ========================================================================== */ /** - * 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: sans-serif; - /* 1 */ font-size: 100%; line-height: 1.5em; - /* 2 */ + /* 1 */ -ms-text-size-adjust: 100%; - /* 3 */ + /* 2 */ -webkit-text-size-adjust: 100%; - /* 3 */ } + /* 2 */ } /* Sections ========================================================================== */ @@ -161,18 +158,10 @@ a { -webkit-text-decoration-skip: objects; /* 2 */ } -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ -a:active, -a:hover { - outline-width: 0; } - /* Text-level semantics ========================================================================== */ /** - * 1. Remove the bottom border in Firefox 39-. + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ abbr[title] { @@ -392,12 +381,10 @@ input { /* 2 */ } /** - * Change the border, margin, and padding in all browsers (opinionated). + * Correct the padding in Firefox. */ fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; } + padding: 0.35em 0.75em 0.625em; } /** * 1. Correct the text wrapping in Edge and IE. diff --git a/test/fixtures/variables/indent-amount/output.css b/test/fixtures/variables/indent-amount/output.css index be92ac7..4cffa78 100644 --- a/test/fixtures/variables/indent-amount/output.css +++ b/test/fixtures/variables/indent-amount/output.css @@ -2,20 +2,17 @@ /* Document ========================================================================== */ /** - * 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: sans-serif; - /* 1 */ line-height: 1.15; - /* 2 */ + /* 1 */ -ms-text-size-adjust: 100%; - /* 3 */ + /* 2 */ -webkit-text-size-adjust: 100%; - /* 3 */ } + /* 2 */ } /* Sections ========================================================================== */ @@ -99,18 +96,10 @@ a { -webkit-text-decoration-skip: objects; /* 2 */ } -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ -a:active, -a:hover { - outline-width: 0; } - /* Text-level semantics ========================================================================== */ /** - * 1. Remove the bottom border in Firefox 39-. + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ abbr[title] { @@ -330,12 +319,10 @@ input { /* 2 */ } /** - * Change the border, margin, and padding in all browsers (opinionated). + * Correct the padding in Firefox. */ fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; } + padding: 0.35em 0.75em 0.625em; } /** * 1. Correct the text wrapping in Edge and IE. |