diff options
author | JohnAlbin <virtually.johnalbin@gmail.com> | 2016-10-21 14:59:04 +0300 |
---|---|---|
committer | JohnAlbin <virtually.johnalbin@gmail.com> | 2016-10-24 07:51:42 +0300 |
commit | ec9f45390ac772a79de35ef8bc89c1b7ed08ec8a (patch) | |
tree | 1bf3e6fdb8f2da44ff9e47b64458330a9ffd898a | |
parent | 76b5921e9fe85ced4b72b82d5b470c28db93a8f3 (diff) |
Convert old "html5" section into the new "sections" section. #88
28 files changed, 1503 insertions, 1035 deletions
diff --git a/fork-versions/default/_normalize.scss b/fork-versions/default/_normalize.scss index c2dd316..3e98e9e 100644 --- a/fork-versions/default/_normalize.scss +++ b/fork-versions/default/_normalize.scss @@ -44,7 +44,7 @@ html { -webkit-text-size-adjust: 100%; /* 3 */ } -/* HTML5 display definitions +/* Sections ========================================================================== */ /** @@ -56,62 +56,63 @@ body { } /** - * Add the correct display in IE <10. - * Add the correct display in Edge, IE, and Firefox for `details` or `summary`. - * Add the correct display in IE for `main`. + * Add the correct display in IE 9-. */ article, aside, -details, -figcaption, -figure, footer, header, -main, -menu, nav, -section, -summary { +section { display: block; } /** - * Add the correct display in IE <10. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ -audio, -canvas, -progress, -video { - display: inline-block; -} - -/** - * Add the correct display and remove excess height in iOS 4-7. - */ +h1 { + @include normalize-font-size($h1-font-size); + @if $normalize-vertical-rhythm { + @include normalize-line-height($h1-font-size); + } -audio:not([controls]) { - display: none; - height: 0; + /* Set 1 unit of vertical rhythm on the top and bottom margins. */ + @include normalize-margin(1 0, $h1-font-size); } -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ +@if $normalize-vertical-rhythm { + h2 { + @include normalize-font-size($h2-font-size); + @include normalize-line-height($h2-font-size); + @include normalize-margin(1 0, $h2-font-size); + } -progress { - vertical-align: baseline; -} + h3 { + @include normalize-font-size($h3-font-size); + @include normalize-line-height($h3-font-size); + @include normalize-margin(1 0, $h3-font-size); + } -/** - * Add the correct display in IE <11, Safari <8, and Firefox <22. - * 1. Add the correct display in IE. - */ + h4 { + @include normalize-font-size($h4-font-size); + @include normalize-line-height($h4-font-size); + @include normalize-margin(1 0, $h4-font-size); + } -template, /* 1 */ -[hidden] { - display: none; + h5 { + @include normalize-font-size($h5-font-size); + @include normalize-line-height($h5-font-size); + @include normalize-margin(1 0, $h5-font-size); + } + + h6 { + @include normalize-font-size($h6-font-size); + @include normalize-line-height($h6-font-size); + @include normalize-margin(1 0, $h6-font-size); + } } /* Links @@ -191,53 +192,6 @@ dfn { } /** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ - -h1 { - @include normalize-font-size($h1-font-size); - @if $normalize-vertical-rhythm { - @include normalize-line-height($h1-font-size); - } - - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - @include normalize-margin(1 0, $h1-font-size); -} - -@if $normalize-vertical-rhythm { - h2 { - @include normalize-font-size($h2-font-size); - @include normalize-line-height($h2-font-size); - @include normalize-margin(1 0, $h2-font-size); - } - - h3 { - @include normalize-font-size($h3-font-size); - @include normalize-line-height($h3-font-size); - @include normalize-margin(1 0, $h3-font-size); - } - - h4 { - @include normalize-font-size($h4-font-size); - @include normalize-line-height($h4-font-size); - @include normalize-margin(1 0, $h4-font-size); - } - - h5 { - @include normalize-font-size($h5-font-size); - @include normalize-line-height($h5-font-size); - @include normalize-margin(1 0, $h5-font-size); - } - - h6 { - @include normalize-font-size($h6-font-size); - @include normalize-line-height($h6-font-size); - @include normalize-margin(1 0, $h6-font-size); - } -} - -/** * Add the correct background and color in IE <10. */ @@ -279,6 +233,24 @@ sup { ========================================================================== */ /** + * Add the correct display in IE 9-. + */ + +audio, +video { + display: inline-block; +} + +/** + * Add the correct display in iOS 4-7. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** * Remove the border on images inside links in IE <11. */ @@ -337,6 +309,15 @@ svg:not(:root) { } /** + * Add the correct display in IE 9-. + */ + +figcaption, +figure { + display: block; +} + +/** * Add the correct margin in IE 8. */ @@ -355,6 +336,14 @@ hr { overflow: visible; /* 2 */ } +/** + * Add the correct display in IE. + */ + +main { + display: block; +} + @if $normalize-vertical-rhythm { /** * Set 1 unit of vertical rhythm on the top and bottom margin. @@ -562,9 +551,70 @@ optgroup { } /** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** * Remove the default vertical scrollbar in IE. */ textarea { overflow: auto; } + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ + +details, /* 1 */ +menu { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Scripting + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + +canvas { + display: inline-block; +} + +/** + * Add the correct display in IE. + */ + +template { + display: none; +} + +/* Hidden + ========================================================================== */ + +/** + * Add the correct display in IE 10-. + */ + +[hidden] { + display: none; +} diff --git a/fork-versions/deprecated-compass/_normalize.scss b/fork-versions/deprecated-compass/_normalize.scss index 3dbfe88..7f89dda 100644 --- a/fork-versions/deprecated-compass/_normalize.scss +++ b/fork-versions/deprecated-compass/_normalize.scss @@ -47,7 +47,7 @@ html { -webkit-text-size-adjust: 100%; /* 2 */ } -/* HTML5 display definitions +/* Sections ========================================================================== */ /** @@ -59,62 +59,67 @@ body { } /** - * Add the correct display in IE <10. - * Add the correct display in Edge, IE, and Firefox for `details` or `summary`. - * Add the correct display in IE for `main`. + * Add the correct display in IE 9-. */ article, aside, -details, -figcaption, -figure, footer, header, -main, -menu, nav, -section, -summary { +section { display: block; } /** - * Add the correct display in IE <10. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ -audio, -canvas, -progress, -video { - display: inline-block; -} - -/** - * Add the correct display and remove excess height in iOS 4-7. - */ +h1 { + /* Set the font-size and line-height while keeping a proper vertical rhythm. */ + @if $normalize-vertical-rhythm { + @include adjust-font-size-to( $h1-font-size ); + } + @else { + font-size: if($rhythm-unit == "px", $h1-font-size, unquote("#{$h1-font-size / $base-font-size}#{$rhythm-unit}")); + } -audio:not([controls]) { - display: none; - height: 0; + /* Set 1 unit of vertical rhythm on the top and bottom margins. */ + @include leader(1, $h1-font-size); + @include trailer(1, $h1-font-size); } -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ +@if $normalize-vertical-rhythm { + h2 { + @include adjust-font-size-to( $h2-font-size ); + @include leader(1, $h2-font-size); + @include trailer(1, $h2-font-size); + } -progress { - vertical-align: baseline; -} + h3 { + @include adjust-font-size-to( $h3-font-size ); + @include leader(1, $h3-font-size); + @include trailer(1, $h3-font-size); + } -/** - * Add the correct display in IE <11, Safari <8, and Firefox <22. - * 1. Add the correct display in IE. - */ + h4 { + @include adjust-font-size-to( $h4-font-size ); + @include leader(1, $h4-font-size); + @include trailer(1, $h4-font-size); + } -template, /* 1 */ -[hidden] { - display: none; + h5 { + @include adjust-font-size-to( $h5-font-size ); + @include leader(1, $h5-font-size); + @include trailer(1, $h5-font-size); + } + + h6 { + @include adjust-font-size-to( $h6-font-size ); + @include leader(1, $h6-font-size); + @include trailer(1, $h6-font-size); + } } /* Links @@ -194,57 +199,6 @@ dfn { } /** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ - -h1 { - /* Set the font-size and line-height while keeping a proper vertical rhythm. */ - @if $normalize-vertical-rhythm { - @include adjust-font-size-to( $h1-font-size ); - } - @else { - font-size: if($rhythm-unit == "px", $h1-font-size, unquote("#{$h1-font-size / $base-font-size}#{$rhythm-unit}")); - } - - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - @include leader(1, $h1-font-size); - @include trailer(1, $h1-font-size); -} - -@if $normalize-vertical-rhythm { - h2 { - @include adjust-font-size-to( $h2-font-size ); - @include leader(1, $h2-font-size); - @include trailer(1, $h2-font-size); - } - - h3 { - @include adjust-font-size-to( $h3-font-size ); - @include leader(1, $h3-font-size); - @include trailer(1, $h3-font-size); - } - - h4 { - @include adjust-font-size-to( $h4-font-size ); - @include leader(1, $h4-font-size); - @include trailer(1, $h4-font-size); - } - - h5 { - @include adjust-font-size-to( $h5-font-size ); - @include leader(1, $h5-font-size); - @include trailer(1, $h5-font-size); - } - - h6 { - @include adjust-font-size-to( $h6-font-size ); - @include leader(1, $h6-font-size); - @include trailer(1, $h6-font-size); - } -} - -/** * Add the correct background and color in IE <10. */ @@ -286,6 +240,24 @@ sup { ========================================================================== */ /** + * Add the correct display in IE 9-. + */ + +audio, +video { + display: inline-block; +} + +/** + * Add the correct display in iOS 4-7. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** * Remove the border on images inside links in IE <11. */ @@ -344,6 +316,15 @@ svg:not(:root) { } /** + * Add the correct display in IE 9-. + */ + +figcaption, +figure { + display: block; +} + +/** * Add the correct margin in IE 8. */ @@ -362,6 +343,14 @@ hr { overflow: visible; /* 2 */ } +/** + * Add the correct display in IE. + */ + +main { + display: block; +} + @if $normalize-vertical-rhythm { /** * Set 1 unit of vertical rhythm on the top and bottom margin. @@ -573,9 +562,70 @@ optgroup { } /** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** * Remove the default vertical scrollbar in IE. */ textarea { overflow: auto; } + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ + +details, /* 1 */ +menu { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Scripting + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + +canvas { + display: inline-block; +} + +/** + * Add the correct display in IE. + */ + +template { + display: none; +} + +/* Hidden + ========================================================================== */ + +/** + * Add the correct display in IE 10-. + */ + +[hidden] { + display: none; +} diff --git a/fork-versions/typey-chroma-kss/base/_html5.scss b/fork-versions/typey-chroma-kss/base/_html5.scss deleted file mode 100644 index e4cecf9..0000000 --- a/fork-versions/typey-chroma-kss/base/_html5.scss +++ /dev/null @@ -1,55 +0,0 @@ -// HTML5 display definitions -// ========================================================================== - - -body { - // Output a horizontal grid to help with debugging typography. The - // $typey-debug variable will toggle its output. - @include typey-debug-grid(); - // Remove default margin and padding. - margin: 0; - padding: 0; -} - -// Add the correct display in IE <10. -// Add the correct display in Edge, IE, and Firefox for `details` or `summary`. -// Add the correct display in IE for `main`. -article, -aside, -details, -figcaption, -figure, -footer, -header, -main, -menu, -nav, -section, -summary { - display: block; -} - -// Add the correct display in IE <10. -audio, -canvas, -progress, -video { - display: inline-block; -} - -// Add the correct display and remove excess height in iOS 4-7. -audio:not([controls]) { - display: none; - height: 0; -} - -// Add the correct vertical alignment in Chrome, Firefox, and Opera. -progress { - vertical-align: baseline; -} - -// Add the correct display in IE <11, Safari <8, and Firefox <22. -template, -[hidden] { - display: none; -} diff --git a/fork-versions/typey-chroma-kss/base/_normalize.scss b/fork-versions/typey-chroma-kss/base/_normalize.scss index 1803466..1d4a83f 100644 --- a/fork-versions/typey-chroma-kss/base/_normalize.scss +++ b/fork-versions/typey-chroma-kss/base/_normalize.scss @@ -10,14 +10,16 @@ // Normalize-scss is broken into modular pieces to make it easier to edit. @import 'document/document'; -@import 'html5'; +@import 'sections/sections'; @import 'links/links'; -@import 'headings/headings'; @import 'text/text'; @import 'grouping/grouping'; @import 'embedded/embedded'; @import 'forms/forms'; @import 'tables/tables'; +@import 'interactive/interactive'; +@import 'scripting/scripting'; +@import 'hidden/hidden'; // Note: we allow the .button component (loaded by forms) to override :link, by // loading links first. diff --git a/fork-versions/typey-chroma-kss/base/embedded/_embedded.scss b/fork-versions/typey-chroma-kss/base/embedded/_embedded.scss index 23359d0..f98c3bf 100644 --- a/fork-versions/typey-chroma-kss/base/embedded/_embedded.scss +++ b/fork-versions/typey-chroma-kss/base/embedded/_embedded.scss @@ -4,6 +4,21 @@ // // Style guide: base.embedded +// Audio +// +// Style guide: base.embedded.audio + +audio { + // Add the correct display in IE 9-. + display: inline-block; +} + +// Add the correct display and remove excess height in iOS 4-7. +audio:not([controls]) { + display: none; + height: 0; +} + // Image // // An `<img>` element represents an image. @@ -39,3 +54,12 @@ svg:not(:root) { // Hide the overflow in IE. overflow: hidden; } + +// Video +// +// Style guide: base.embedded.video + +video { + // Add the correct display in IE 9-. + display: inline-block; +} diff --git a/fork-versions/typey-chroma-kss/base/forms/_forms.scss b/fork-versions/typey-chroma-kss/base/forms/_forms.scss index c59c0ff..4d0285c 100644 --- a/fork-versions/typey-chroma-kss/base/forms/_forms.scss +++ b/fork-versions/typey-chroma-kss/base/forms/_forms.scss @@ -234,6 +234,19 @@ optgroup { font-weight: bold; } +// Progress +// +// The `<progress>` HTML element. +// +// Style guide: forms.base.progress + +progress { + // Add the correct display in IE 9-. + display: inline-block; + // Add the correct vertical alignment in Chrome, Firefox, and Opera. + vertical-align: baseline; +} + // Text areas // // The `<textarea>` element represents a multi-line plain text form field. diff --git a/fork-versions/typey-chroma-kss/base/hidden/_hidden.scss b/fork-versions/typey-chroma-kss/base/hidden/_hidden.scss new file mode 100644 index 0000000..0b5bf13 --- /dev/null +++ b/fork-versions/typey-chroma-kss/base/hidden/_hidden.scss @@ -0,0 +1,10 @@ +// Hidden +// +// Some older browsers do not hide elements that have a `hidden` attribute. +// +// Style guide: base.hidden + +[hidden] { + // Add the correct display in IE 10-. + display: none; +} diff --git a/fork-versions/typey-chroma-kss/base/interactive/_interactive.scss b/fork-versions/typey-chroma-kss/base/interactive/_interactive.scss new file mode 100644 index 0000000..8e0818d --- /dev/null +++ b/fork-versions/typey-chroma-kss/base/interactive/_interactive.scss @@ -0,0 +1,26 @@ +// Interactive +// +// Style guide: base.interactive + +// Details +// +// Style guide: base.interactive.details + +details { + // Add the correct display in Edge, IE, and Firefox. + display: block; +} + +summary { + // Add the correct display in all browsers. + display: list-item; +} + +// Menu +// +// Style guide: base.interactive.menu + +menu { + // Add the correct display in IE 9-. + display: block; +} diff --git a/fork-versions/typey-chroma-kss/base/scripting/_scripting.scss b/fork-versions/typey-chroma-kss/base/scripting/_scripting.scss new file mode 100644 index 0000000..05448d9 --- /dev/null +++ b/fork-versions/typey-chroma-kss/base/scripting/_scripting.scss @@ -0,0 +1,24 @@ +// Scripting +// +// Style guide: base.scripting + +// Canvas +// +// Style guide: base.scripting.canvas + +canvas { + // Add the correct display in IE 9-. + display: inline-block; +} + +// Template +// +// Some older browsers do not hide elements the web components' `template` +// element. +// +// Style guide: base.scripting.template + +template { + // Add the correct display in IE. + display: none; +} diff --git a/fork-versions/typey-chroma-kss/base/headings/_headings.scss b/fork-versions/typey-chroma-kss/base/sections/_sections.scss index 7993211..2dd3697 100644 --- a/fork-versions/typey-chroma-kss/base/headings/_headings.scss +++ b/fork-versions/typey-chroma-kss/base/sections/_sections.scss @@ -1,3 +1,26 @@ +// Sections +// ========================================================================== + + +body { + // Output a horizontal grid to help with debugging typography. The + // $typey-debug variable will toggle its output. + @include typey-debug-grid(); + // Remove the margin in all browsers (opinionated). + margin: 0; + padding: 0; +} + +// Add the correct display in IE 9-. +article, +aside, +footer, +header, +nav, +section { + display: block; +} + // Headings // // All HTML headings, `<h1>` through `<h6>`, are available. `%h1` through `%h6` @@ -8,8 +31,8 @@ // // Style guide: base.headings -// Address variable `h1` font-size and margin within `section` and `article` -// contexts in Firefox 4+, Safari, and Chrome. +// Correct the font size and margin on `h1` elements within `section` and +// `article` contexts in Chrome, Firefox, and Safari. h1, %h1 { // Set the font-size and line-height while keeping a proper vertical rhythm. diff --git a/fork-versions/typey-chroma-kss/base/headings/headings-h.twig b/fork-versions/typey-chroma-kss/base/sections/headings-h.twig index 4806892..4806892 100644 --- a/fork-versions/typey-chroma-kss/base/headings/headings-h.twig +++ b/fork-versions/typey-chroma-kss/base/sections/headings-h.twig diff --git a/fork-versions/typey/_normalize.scss b/fork-versions/typey/_normalize.scss index 600b823..b8bd894 100644 --- a/fork-versions/typey/_normalize.scss +++ b/fork-versions/typey/_normalize.scss @@ -23,7 +23,7 @@ html { -webkit-text-size-adjust: 100%; /* 3 */ } -/* HTML5 display definitions +/* Sections ========================================================================== */ /** @@ -35,62 +35,53 @@ body { } /** - * Add the correct display in IE <10. - * Add the correct display in Edge, IE, and Firefox for `details` or `summary`. - * Add the correct display in IE for `main`. + * Add the correct display in IE 9-. */ article, aside, -details, -figcaption, -figure, footer, header, -main, -menu, nav, -section, -summary { +section { display: block; } /** - * Add the correct display in IE <10. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ -audio, -canvas, -progress, -video { - display: inline-block; -} +h1 { + @include type-layout(xxl, 2); -/** - * Add the correct display and remove excess height in iOS 4-7. - */ + /* Set 1 unit of vertical rhythm on the top and bottom margins. */ + @include margin(1 0, xxl); +} -audio:not([controls]) { - display: none; - height: 0; +h2 { + @include type-layout(xl, 1.5); + @include margin(1 0, xl); } -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ +h3 { + @include type-layout(l, 1); + @include margin(1 0, l); +} -progress { - vertical-align: baseline; +h4 { + @include type-layout(m, 1); + @include margin(1 0, m); } -/** - * Add the correct display in IE <11, Safari <8, and Firefox <22. - * 1. Add the correct display in IE. - */ +h5 { + @include type-layout(s, 1); + @include margin(1 0, s); +} -template, /* 1 */ -[hidden] { - display: none; +h6 { + @include type-layout(xs, 1); + @include margin(1 0, xs); } /* Links @@ -170,43 +161,6 @@ dfn { } /** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ - -h1 { - @include type-layout(xxl, 2); - - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - @include margin(1 0, xxl); -} - -h2 { - @include type-layout(xl, 1.5); - @include margin(1 0, xl); -} - -h3 { - @include type-layout(l, 1); - @include margin(1 0, l); -} - -h4 { - @include type-layout(m, 1); - @include margin(1 0, m); -} - -h5 { - @include type-layout(s, 1); - @include margin(1 0, s); -} - -h6 { - @include type-layout(xs, 1); - @include margin(1 0, xs); -} - -/** * Add the correct background and color in IE <10. */ @@ -248,6 +202,24 @@ sup { ========================================================================== */ /** + * Add the correct display in IE 9-. + */ + +audio, +video { + display: inline-block; +} + +/** + * Add the correct display in iOS 4-7. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** * Remove the border on images inside links in IE <11. */ @@ -304,6 +276,15 @@ ul { } /** + * Add the correct display in IE 9-. + */ + +figcaption, +figure { + display: block; +} + +/** * Add the correct margin in IE 8. */ @@ -323,6 +304,14 @@ hr { } /** + * Add the correct display in IE. + */ + +main { + display: block; +} + +/** * Set 1 unit of vertical rhythm on the top and bottom margin. */ @@ -528,9 +517,70 @@ optgroup { } /** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** * Remove the default vertical scrollbar in IE. */ textarea { overflow: auto; } + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ + +details, /* 1 */ +menu { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Scripting + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + +canvas { + display: inline-block; +} + +/** + * Add the correct display in IE. + */ + +template { + display: none; +} + +/* Hidden + ========================================================================== */ + +/** + * Add the correct display in IE 10-. + */ + +[hidden] { + display: none; +} diff --git a/sass/normalize/_normalize-mixin.scss b/sass/normalize/_normalize-mixin.scss index 1989910..bf1df1a 100644 --- a/sass/normalize/_normalize-mixin.scss +++ b/sass/normalize/_normalize-mixin.scss @@ -73,8 +73,8 @@ } } - @if _normalize-include(html5) { - /* HTML5 display definitions + @if _normalize-include(sections) { + /* Sections ========================================================================== */ /** @@ -86,62 +86,63 @@ } /** - * Add the correct display in IE <10. - * Add the correct display in Edge, IE, and Firefox for `details` or `summary`. - * Add the correct display in IE for `main`. + * Add the correct display in IE 9-. */ article, aside, - details, - figcaption, - figure, footer, header, - main, - menu, nav, - section, - summary { + section { display: block; } /** - * Add the correct display in IE <10. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ - audio, - canvas, - progress, - video { - display: inline-block; - } - - /** - * Add the correct display and remove excess height in iOS 4-7. - */ + h1 { + @include normalize-font-size($h1-font-size); + @if $normalize-vertical-rhythm { + @include normalize-line-height($h1-font-size); + } - audio:not([controls]) { - display: none; - height: 0; + /* Set 1 unit of vertical rhythm on the top and bottom margins. */ + @include normalize-margin(1 0, $h1-font-size); } - /** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ + @if $normalize-vertical-rhythm { + h2 { + @include normalize-font-size($h2-font-size); + @include normalize-line-height($h2-font-size); + @include normalize-margin(1 0, $h2-font-size); + } - progress { - vertical-align: baseline; - } + h3 { + @include normalize-font-size($h3-font-size); + @include normalize-line-height($h3-font-size); + @include normalize-margin(1 0, $h3-font-size); + } - /** - * Add the correct display in IE <11, Safari <8, and Firefox <22. - * 1. Add the correct display in IE. - */ + h4 { + @include normalize-font-size($h4-font-size); + @include normalize-line-height($h4-font-size); + @include normalize-margin(1 0, $h4-font-size); + } - template, /* 1 */ - [hidden] { - display: none; + h5 { + @include normalize-font-size($h5-font-size); + @include normalize-line-height($h5-font-size); + @include normalize-margin(1 0, $h5-font-size); + } + + h6 { + @include normalize-font-size($h6-font-size); + @include normalize-line-height($h6-font-size); + @include normalize-margin(1 0, $h6-font-size); + } } } @@ -224,53 +225,6 @@ } /** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ - - h1 { - @include normalize-font-size($h1-font-size); - @if $normalize-vertical-rhythm { - @include normalize-line-height($h1-font-size); - } - - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - @include normalize-margin(1 0, $h1-font-size); - } - - @if $normalize-vertical-rhythm { - h2 { - @include normalize-font-size($h2-font-size); - @include normalize-line-height($h2-font-size); - @include normalize-margin(1 0, $h2-font-size); - } - - h3 { - @include normalize-font-size($h3-font-size); - @include normalize-line-height($h3-font-size); - @include normalize-margin(1 0, $h3-font-size); - } - - h4 { - @include normalize-font-size($h4-font-size); - @include normalize-line-height($h4-font-size); - @include normalize-margin(1 0, $h4-font-size); - } - - h5 { - @include normalize-font-size($h5-font-size); - @include normalize-line-height($h5-font-size); - @include normalize-margin(1 0, $h5-font-size); - } - - h6 { - @include normalize-font-size($h6-font-size); - @include normalize-line-height($h6-font-size); - @include normalize-margin(1 0, $h6-font-size); - } - } - - /** * Add the correct background and color in IE <10. */ @@ -314,6 +268,24 @@ ========================================================================== */ /** + * Add the correct display in IE <10. + */ + + audio, + video { + display: inline-block; + } + + /** + * Add the correct display and remove excess height in iOS 4-7. + */ + + audio:not([controls]) { + display: none; + height: 0; + } + + /** * Remove the border on images inside links in IE <11. */ @@ -602,6 +574,16 @@ } /** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + + progress { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ + } + + /** * Remove the default vertical scrollbar in IE. */ @@ -609,4 +591,61 @@ overflow: auto; } } + + @if _normalize-include(interactive) { + /* Interactive + ========================================================================== */ + + /* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ + + details, /* 1 */ + menu { + display: block; + } + + /* + * Add the correct display in all browsers. + */ + + summary { + display: list-item; + } + } + + @if _normalize-include(scripting) { + /* Scripting + ========================================================================== */ + + /** + * Add the correct display in IE 9-. + */ + + canvas { + display: inline-block; + } + + /** + * Add the correct display in IE. + */ + + template { + display: none; + } + } + + @if _normalize-include(hidden) { + /* Hidden + ========================================================================== */ + + /** + * Add the correct display in IE 10-. + */ + + [hidden] { + display: none; + } + } } diff --git a/test/fixtures/fork-versions/default/output.css b/test/fixtures/fork-versions/default/output.css index f32df3a..222571b 100644 --- a/test/fixtures/fork-versions/default/output.css +++ b/test/fixtures/fork-versions/default/output.css @@ -17,7 +17,7 @@ html { -webkit-text-size-adjust: 100%; /* 3 */ } -/* HTML5 display definitions +/* Sections ========================================================================== */ /** * Remove the margin in all browsers (opinionated). @@ -26,53 +26,24 @@ body { margin: 0; } /** - * Add the correct display in IE <10. - * Add the correct display in Edge, IE, and Firefox for `details` or `summary`. - * Add the correct display in IE for `main`. + * Add the correct display in IE 9-. */ article, aside, -details, -figcaption, -figure, footer, header, -main, -menu, nav, -section, -summary { +section { display: block; } /** - * Add the correct display in IE <10. - */ -audio, -canvas, -progress, -video { - display: inline-block; } - -/** - * Add the correct display and remove excess height in iOS 4-7. - */ -audio:not([controls]) { - display: none; - height: 0; } - -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ -progress { - vertical-align: baseline; } - -/** - * Add the correct display in IE <11, Safari <8, and Firefox <22. - * 1. Add the correct display in IE. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ -template, -[hidden] { - display: none; } +h1 { + font-size: 2em; + /* Set 1 unit of vertical rhythm on the top and bottom margins. */ + margin: 0.75em 0; } /* Links ========================================================================== */ @@ -142,15 +113,6 @@ dfn { font-style: italic; } /** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ -h1 { - font-size: 2em; - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - margin: 0.75em 0; } - -/** * Add the correct background and color in IE <10. */ mark { @@ -183,6 +145,20 @@ sup { /* Embedded content ========================================================================== */ /** + * Add the correct display in IE 9-. + */ +audio, +video { + display: inline-block; } + +/** + * Add the correct display in iOS 4-7. + */ +audio:not([controls]) { + display: none; + height: 0; } + +/** * Remove the border on images inside links in IE <11. */ img { @@ -197,6 +173,13 @@ svg:not(:root) { /* Grouping content ========================================================================== */ /** + * Add the correct display in IE 9-. + */ +figcaption, +figure { + display: block; } + +/** * Add the correct margin in IE 8. */ figure { @@ -214,6 +197,12 @@ hr { overflow: visible; /* 2 */ } +/** + * Add the correct display in IE. + */ +main { + display: block; } + /* Forms ========================================================================== */ /** @@ -389,7 +378,55 @@ optgroup { font-weight: bold; } /** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ +progress { + display: inline-block; + /* 1 */ + vertical-align: baseline; + /* 2 */ } + +/** * Remove the default vertical scrollbar in IE. */ textarea { overflow: auto; } + +/* Interactive + ========================================================================== */ +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ +details, +menu { + display: block; } + +/* + * Add the correct display in all browsers. + */ +summary { + display: list-item; } + +/* Scripting + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +canvas { + display: inline-block; } + +/** + * Add the correct display in IE. + */ +template { + display: none; } + +/* Hidden + ========================================================================== */ +/** + * Add the correct display in IE 10-. + */ +[hidden] { + display: none; } diff --git a/test/fixtures/fork-versions/deprecated-compass/output.css b/test/fixtures/fork-versions/deprecated-compass/output.css index dc434ca..c8fc711 100644 --- a/test/fixtures/fork-versions/deprecated-compass/output.css +++ b/test/fixtures/fork-versions/deprecated-compass/output.css @@ -25,7 +25,7 @@ html { -webkit-text-size-adjust: 100%; /* 2 */ } -/* HTML5 display definitions +/* Sections ========================================================================== */ /** * Remove the margin in all browsers (opinionated). @@ -34,53 +34,26 @@ body { margin: 0; } /** - * Add the correct display in IE <10. - * Add the correct display in Edge, IE, and Firefox for `details` or `summary`. - * Add the correct display in IE for `main`. + * Add the correct display in IE 9-. */ article, aside, -details, -figcaption, -figure, footer, header, -main, -menu, nav, -section, -summary { +section { display: block; } /** - * Add the correct display in IE <10. - */ -audio, -canvas, -progress, -video { - display: inline-block; } - -/** - * Add the correct display and remove excess height in iOS 4-7. - */ -audio:not([controls]) { - display: none; - height: 0; } - -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ -progress { - vertical-align: baseline; } - -/** - * Add the correct display in IE <11, Safari <8, and Firefox <22. - * 1. Add the correct display in IE. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ -template, -[hidden] { - display: none; } +h1 { + /* Set the font-size and line-height while keeping a proper vertical rhythm. */ + font-size: 2em; + /* Set 1 unit of vertical rhythm on the top and bottom margins. */ + margin-top: 0.75em; + margin-bottom: 0.75em; } /* Links ========================================================================== */ @@ -150,17 +123,6 @@ dfn { font-style: italic; } /** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ -h1 { - /* Set the font-size and line-height while keeping a proper vertical rhythm. */ - font-size: 2em; - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - margin-top: 0.75em; - margin-bottom: 0.75em; } - -/** * Add the correct background and color in IE <10. */ mark { @@ -193,6 +155,20 @@ sup { /* Embedded content ========================================================================== */ /** + * Add the correct display in IE 9-. + */ +audio, +video { + display: inline-block; } + +/** + * Add the correct display in iOS 4-7. + */ +audio:not([controls]) { + display: none; + height: 0; } + +/** * Remove the border on images inside links in IE <11. */ img { @@ -207,6 +183,13 @@ svg:not(:root) { /* Grouping content ========================================================================== */ /** + * Add the correct display in IE 9-. + */ +figcaption, +figure { + display: block; } + +/** * Add the correct margin in IE 8. */ figure { @@ -226,6 +209,12 @@ hr { overflow: visible; /* 2 */ } +/** + * Add the correct display in IE. + */ +main { + display: block; } + /* Forms ========================================================================== */ /** @@ -415,7 +404,55 @@ optgroup { font-weight: bold; } /** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ +progress { + display: inline-block; + /* 1 */ + vertical-align: baseline; + /* 2 */ } + +/** * Remove the default vertical scrollbar in IE. */ textarea { overflow: auto; } + +/* Interactive + ========================================================================== */ +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ +details, +menu { + display: block; } + +/* + * Add the correct display in all browsers. + */ +summary { + display: list-item; } + +/* Scripting + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +canvas { + display: inline-block; } + +/** + * Add the correct display in IE. + */ +template { + display: none; } + +/* Hidden + ========================================================================== */ +/** + * Add the correct display in IE 10-. + */ +[hidden] { + display: none; } diff --git a/test/fixtures/fork-versions/typey-chroma-kss/output.css b/test/fixtures/fork-versions/typey-chroma-kss/output.css index aa7c144..bed0d1b 100644 --- a/test/fixtures/fork-versions/typey-chroma-kss/output.css +++ b/test/fixtures/fork-versions/typey-chroma-kss/output.css @@ -19,64 +19,12 @@ body { article, aside, -details, -figcaption, -figure, footer, header, -main, -menu, nav, -section, -summary { +section { display: block; } -audio, -canvas, -progress, -video { - display: inline-block; } - -audio:not([controls]) { - display: none; - height: 0; } - -progress { - vertical-align: baseline; } - -template, -[hidden] { - display: none; } - -a { - color: #0072b9; - -webkit-text-decoration-skip: objects; } - -:visited { - color: #003353; } - -a:active { - color: #c00; } - a:active:not(.button) { - background-color: transparent; } - -a:active, -a:hover { - outline-width: 0; } - -@media print { - :link, - :visited { - text-decoration: underline; } - a[href]:after { - content: " (" attr(href) ")"; - font-weight: normal; - font-size: 16px; - text-decoration: none; } - a[href^='javascript:']:after, - a[href^='#']:after { - content: ''; } } - h1 { font-size: 2rem; line-height: 3rem; @@ -113,6 +61,35 @@ h6 { margin-top: 1.5rem; margin-bottom: 1.5rem; } +a { + color: #0072b9; + -webkit-text-decoration-skip: objects; } + +:visited { + color: #003353; } + +a:active { + color: #c00; } + a:active:not(.button) { + background-color: transparent; } + +a:active, +a:hover { + outline-width: 0; } + +@media print { + :link, + :visited { + text-decoration: underline; } + a[href]:after { + content: " (" attr(href) ")"; + font-weight: normal; + font-size: 16px; + text-decoration: none; } + a[href^='javascript:']:after, + a[href^='#']:after { + content: ''; } } + abbr[title] { border-bottom: 0; text-decoration: underline; @@ -203,6 +180,13 @@ p, pre { margin: 1.5rem 0; } +audio { + display: inline-block; } + +audio:not([controls]) { + display: none; + height: 0; } + img { border-style: none; } @@ -214,6 +198,9 @@ svg { svg:not(:root) { overflow: hidden; } +video { + display: inline-block; } + button, input, optgroup, @@ -344,6 +331,10 @@ legend { optgroup { font-weight: bold; } +progress { + display: inline-block; + vertical-align: baseline; } + textarea { overflow: auto; } @@ -356,3 +347,21 @@ table { td, th { padding: 0; } + +details { + display: block; } + +summary { + display: list-item; } + +menu { + display: block; } + +canvas { + display: inline-block; } + +template { + display: none; } + +[hidden] { + display: none; } diff --git a/test/fixtures/fork-versions/typey/output.css b/test/fixtures/fork-versions/typey/output.css index 8ab9b40..949d267 100644 --- a/test/fixtures/fork-versions/typey/output.css +++ b/test/fixtures/fork-versions/typey/output.css @@ -21,7 +21,7 @@ html { html { font-size: 12pt; } } -/* HTML5 display definitions +/* Sections ========================================================================== */ /** * Remove the margin in all browsers (opinionated). @@ -30,53 +30,50 @@ body { margin: 0; } /** - * Add the correct display in IE <10. - * Add the correct display in Edge, IE, and Firefox for `details` or `summary`. - * Add the correct display in IE for `main`. + * Add the correct display in IE 9-. */ article, aside, -details, -figcaption, -figure, footer, header, -main, -menu, nav, -section, -summary { +section { display: block; } /** - * Add the correct display in IE <10. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ -audio, -canvas, -progress, -video { - display: inline-block; } +h1 { + font-size: 2rem; + line-height: 3rem; + /* Set 1 unit of vertical rhythm on the top and bottom margins. */ + margin: 1.5rem 0; } -/** - * Add the correct display and remove excess height in iOS 4-7. - */ -audio:not([controls]) { - display: none; - height: 0; } +h2 { + font-size: 1.5rem; + line-height: 2.25rem; + margin: 1.5rem 0; } -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ -progress { - vertical-align: baseline; } +h3 { + font-size: 1.25rem; + line-height: 1.5rem; + margin: 1.5rem 0; } -/** - * Add the correct display in IE <11, Safari <8, and Firefox <22. - * 1. Add the correct display in IE. - */ -template, -[hidden] { - display: none; } +h4 { + font-size: 1rem; + line-height: 1.5rem; + margin: 1.5rem 0; } + +h5 { + font-size: 0.875rem; + line-height: 1.5rem; + margin: 1.5rem 0; } + +h6 { + font-size: 0.625rem; + line-height: 1.5rem; + margin: 1.5rem 0; } /* Links ========================================================================== */ @@ -146,41 +143,6 @@ dfn { font-style: italic; } /** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ -h1 { - font-size: 2rem; - line-height: 3rem; - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - margin: 1.5rem 0; } - -h2 { - font-size: 1.5rem; - line-height: 2.25rem; - margin: 1.5rem 0; } - -h3 { - font-size: 1.25rem; - line-height: 1.5rem; - margin: 1.5rem 0; } - -h4 { - font-size: 1rem; - line-height: 1.5rem; - margin: 1.5rem 0; } - -h5 { - font-size: 0.875rem; - line-height: 1.5rem; - margin: 1.5rem 0; } - -h6 { - font-size: 0.625rem; - line-height: 1.5rem; - margin: 1.5rem 0; } - -/** * Add the correct background and color in IE <10. */ mark { @@ -213,6 +175,20 @@ sup { /* Embedded content ========================================================================== */ /** + * Add the correct display in IE 9-. + */ +audio, +video { + display: inline-block; } + +/** + * Add the correct display in iOS 4-7. + */ +audio:not([controls]) { + display: none; + height: 0; } + +/** * Remove the border on images inside links in IE <11. */ img { @@ -256,6 +232,13 @@ ul { padding: 0 0 0 40px; } /** + * Add the correct display in IE 9-. + */ +figcaption, +figure { + display: block; } + +/** * Add the correct margin in IE 8. */ figure { @@ -274,6 +257,12 @@ hr { /* 2 */ } /** + * Add the correct display in IE. + */ +main { + display: block; } + +/** * Set 1 unit of vertical rhythm on the top and bottom margin. */ p, @@ -455,7 +444,55 @@ optgroup { font-weight: bold; } /** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ +progress { + display: inline-block; + /* 1 */ + vertical-align: baseline; + /* 2 */ } + +/** * Remove the default vertical scrollbar in IE. */ textarea { overflow: auto; } + +/* Interactive + ========================================================================== */ +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ +details, +menu { + display: block; } + +/* + * Add the correct display in all browsers. + */ +summary { + display: list-item; } + +/* Scripting + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +canvas { + display: inline-block; } + +/** + * Add the correct display in IE. + */ +template { + display: none; } + +/* Hidden + ========================================================================== */ +/** + * Add the correct display in IE 10-. + */ +[hidden] { + display: none; } diff --git a/test/fixtures/import-now/output.css b/test/fixtures/import-now/output.css index 66cfe7f..21b8a2b 100644 --- a/test/fixtures/import-now/output.css +++ b/test/fixtures/import-now/output.css @@ -17,7 +17,7 @@ html { -webkit-text-size-adjust: 100%; /* 3 */ } -/* HTML5 display definitions +/* Sections ========================================================================== */ /** * Remove the margin in all browsers (opinionated). @@ -26,53 +26,24 @@ body { margin: 0; } /** - * Add the correct display in IE <10. - * Add the correct display in Edge, IE, and Firefox for `details` or `summary`. - * Add the correct display in IE for `main`. + * Add the correct display in IE 9-. */ article, aside, -details, -figcaption, -figure, footer, header, -main, -menu, nav, -section, -summary { +section { display: block; } /** - * Add the correct display in IE <10. - */ -audio, -canvas, -progress, -video { - display: inline-block; } - -/** - * Add the correct display and remove excess height in iOS 4-7. - */ -audio:not([controls]) { - display: none; - height: 0; } - -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ -progress { - vertical-align: baseline; } - -/** - * Add the correct display in IE <11, Safari <8, and Firefox <22. - * 1. Add the correct display in IE. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ -template, -[hidden] { - display: none; } +h1 { + font-size: 2em; + /* Set 1 unit of vertical rhythm on the top and bottom margins. */ + margin: 0.75em 0; } /* Links ========================================================================== */ @@ -139,15 +110,6 @@ dfn { font-style: italic; } /** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ -h1 { - font-size: 2em; - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - margin: 0.75em 0; } - -/** * Add the correct background and color in IE <10. */ mark { @@ -180,6 +142,20 @@ sup { /* Embedded content ========================================================================== */ /** + * Add the correct display in IE <10. + */ +audio, +video { + display: inline-block; } + +/** + * Add the correct display and remove excess height in iOS 4-7. + */ +audio:not([controls]) { + display: none; + height: 0; } + +/** * Remove the border on images inside links in IE <11. */ img { @@ -390,7 +366,55 @@ optgroup { font-weight: bold; } /** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ +progress { + display: inline-block; + /* 1 */ + vertical-align: baseline; + /* 2 */ } + +/** * Remove the default vertical scrollbar in IE. */ textarea { overflow: auto; } + +/* Interactive + ========================================================================== */ +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ +details, +menu { + display: block; } + +/* + * Add the correct display in all browsers. + */ +summary { + display: list-item; } + +/* Scripting + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +canvas { + display: inline-block; } + +/** + * Add the correct display in IE. + */ +template { + display: none; } + +/* Hidden + ========================================================================== */ +/** + * Add the correct display in IE 10-. + */ +[hidden] { + display: none; } diff --git a/test/fixtures/normalize/exclude-multiple/output.css b/test/fixtures/normalize/exclude-multiple/output.css index d5b10bd..d942234 100644 --- a/test/fixtures/normalize/exclude-multiple/output.css +++ b/test/fixtures/normalize/exclude-multiple/output.css @@ -17,7 +17,7 @@ html { -webkit-text-size-adjust: 100%; /* 3 */ } -/* HTML5 display definitions +/* Sections ========================================================================== */ /** * Remove the margin in all browsers (opinionated). @@ -26,53 +26,24 @@ body { margin: 0; } /** - * Add the correct display in IE <10. - * Add the correct display in Edge, IE, and Firefox for `details` or `summary`. - * Add the correct display in IE for `main`. + * Add the correct display in IE 9-. */ article, aside, -details, -figcaption, -figure, footer, header, -main, -menu, nav, -section, -summary { +section { display: block; } /** - * Add the correct display in IE <10. - */ -audio, -canvas, -progress, -video { - display: inline-block; } - -/** - * Add the correct display and remove excess height in iOS 4-7. - */ -audio:not([controls]) { - display: none; - height: 0; } - -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ -progress { - vertical-align: baseline; } - -/** - * Add the correct display in IE <11, Safari <8, and Firefox <22. - * 1. Add the correct display in IE. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ -template, -[hidden] { - display: none; } +h1 { + font-size: 2em; + /* Set 1 unit of vertical rhythm on the top and bottom margins. */ + margin: 0.75em 0; } /* Links ========================================================================== */ @@ -139,15 +110,6 @@ dfn { font-style: italic; } /** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ -h1 { - font-size: 2em; - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - margin: 0.75em 0; } - -/** * Add the correct background and color in IE <10. */ mark { @@ -352,7 +314,55 @@ optgroup { font-weight: bold; } /** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ +progress { + display: inline-block; + /* 1 */ + vertical-align: baseline; + /* 2 */ } + +/** * Remove the default vertical scrollbar in IE. */ textarea { overflow: auto; } + +/* Interactive + ========================================================================== */ +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ +details, +menu { + display: block; } + +/* + * Add the correct display in all browsers. + */ +summary { + display: list-item; } + +/* Scripting + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +canvas { + display: inline-block; } + +/** + * Add the correct display in IE. + */ +template { + display: none; } + +/* Hidden + ========================================================================== */ +/** + * Add the correct display in IE 10-. + */ +[hidden] { + display: none; } diff --git a/test/fixtures/normalize/exclude-single/output.css b/test/fixtures/normalize/exclude-single/output.css index b0f2f39..2d72c0d 100644 --- a/test/fixtures/normalize/exclude-single/output.css +++ b/test/fixtures/normalize/exclude-single/output.css @@ -17,7 +17,7 @@ html { -webkit-text-size-adjust: 100%; /* 3 */ } -/* HTML5 display definitions +/* Sections ========================================================================== */ /** * Remove the margin in all browsers (opinionated). @@ -26,53 +26,24 @@ body { margin: 0; } /** - * Add the correct display in IE <10. - * Add the correct display in Edge, IE, and Firefox for `details` or `summary`. - * Add the correct display in IE for `main`. + * Add the correct display in IE 9-. */ article, aside, -details, -figcaption, -figure, footer, header, -main, -menu, nav, -section, -summary { +section { display: block; } /** - * Add the correct display in IE <10. - */ -audio, -canvas, -progress, -video { - display: inline-block; } - -/** - * Add the correct display and remove excess height in iOS 4-7. - */ -audio:not([controls]) { - display: none; - height: 0; } - -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ -progress { - vertical-align: baseline; } - -/** - * Add the correct display in IE <11, Safari <8, and Firefox <22. - * 1. Add the correct display in IE. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ -template, -[hidden] { - display: none; } +h1 { + font-size: 2em; + /* Set 1 unit of vertical rhythm on the top and bottom margins. */ + margin: 0.75em 0; } /* Links ========================================================================== */ @@ -139,15 +110,6 @@ dfn { font-style: italic; } /** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ -h1 { - font-size: 2em; - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - margin: 0.75em 0; } - -/** * Add the correct background and color in IE <10. */ mark { @@ -180,6 +142,20 @@ sup { /* Embedded content ========================================================================== */ /** + * Add the correct display in IE <10. + */ +audio, +video { + display: inline-block; } + +/** + * Add the correct display and remove excess height in iOS 4-7. + */ +audio:not([controls]) { + display: none; + height: 0; } + +/** * Remove the border on images inside links in IE <11. */ img { @@ -214,3 +190,41 @@ hr { pre { font-family: monospace, monospace; font-size: 1em; } + +/* Interactive + ========================================================================== */ +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ +details, +menu { + display: block; } + +/* + * Add the correct display in all browsers. + */ +summary { + display: list-item; } + +/* Scripting + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +canvas { + display: inline-block; } + +/** + * Add the correct display in IE. + */ +template { + display: none; } + +/* Hidden + ========================================================================== */ +/** + * Add the correct display in IE 10-. + */ +[hidden] { + display: none; } diff --git a/test/fixtures/normalize/exclude-string/input.scss b/test/fixtures/normalize/exclude-string/input.scss index b34be63..9c070c4 100644 --- a/test/fixtures/normalize/exclude-string/input.scss +++ b/test/fixtures/normalize/exclude-string/input.scss @@ -1,2 +1,2 @@ @import 'normalize'; -@include normalize($exclude: tables); +@include normalize($exclude: scripting); diff --git a/test/fixtures/normalize/exclude-string/output.css b/test/fixtures/normalize/exclude-string/output.css index 66cfe7f..9d9c2e0 100644 --- a/test/fixtures/normalize/exclude-string/output.css +++ b/test/fixtures/normalize/exclude-string/output.css @@ -17,7 +17,7 @@ html { -webkit-text-size-adjust: 100%; /* 3 */ } -/* HTML5 display definitions +/* Sections ========================================================================== */ /** * Remove the margin in all browsers (opinionated). @@ -26,53 +26,24 @@ body { margin: 0; } /** - * Add the correct display in IE <10. - * Add the correct display in Edge, IE, and Firefox for `details` or `summary`. - * Add the correct display in IE for `main`. + * Add the correct display in IE 9-. */ article, aside, -details, -figcaption, -figure, footer, header, -main, -menu, nav, -section, -summary { +section { display: block; } /** - * Add the correct display in IE <10. - */ -audio, -canvas, -progress, -video { - display: inline-block; } - -/** - * Add the correct display and remove excess height in iOS 4-7. - */ -audio:not([controls]) { - display: none; - height: 0; } - -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ -progress { - vertical-align: baseline; } - -/** - * Add the correct display in IE <11, Safari <8, and Firefox <22. - * 1. Add the correct display in IE. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ -template, -[hidden] { - display: none; } +h1 { + font-size: 2em; + /* Set 1 unit of vertical rhythm on the top and bottom margins. */ + margin: 0.75em 0; } /* Links ========================================================================== */ @@ -139,15 +110,6 @@ dfn { font-style: italic; } /** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ -h1 { - font-size: 2em; - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - margin: 0.75em 0; } - -/** * Add the correct background and color in IE <10. */ mark { @@ -180,6 +142,20 @@ sup { /* Embedded content ========================================================================== */ /** + * Add the correct display in IE <10. + */ +audio, +video { + display: inline-block; } + +/** + * Add the correct display and remove excess height in iOS 4-7. + */ +audio:not([controls]) { + display: none; + height: 0; } + +/** * Remove the border on images inside links in IE <11. */ img { @@ -390,7 +366,41 @@ optgroup { font-weight: bold; } /** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ +progress { + display: inline-block; + /* 1 */ + vertical-align: baseline; + /* 2 */ } + +/** * Remove the default vertical scrollbar in IE. */ textarea { overflow: auto; } + +/* Interactive + ========================================================================== */ +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ +details, +menu { + display: block; } + +/* + * Add the correct display in all browsers. + */ +summary { + display: list-item; } + +/* Hidden + ========================================================================== */ +/** + * Add the correct display in IE 10-. + */ +[hidden] { + display: none; } diff --git a/test/fixtures/normalize/include-multiple/input.scss b/test/fixtures/normalize/include-multiple/input.scss index 242dc19..4ce2f61 100644 --- a/test/fixtures/normalize/include-multiple/input.scss +++ b/test/fixtures/normalize/include-multiple/input.scss @@ -1,2 +1,2 @@ @import 'normalize'; -@include normalize((document html5)); +@include normalize((document sections)); diff --git a/test/fixtures/normalize/include-multiple/output.css b/test/fixtures/normalize/include-multiple/output.css index d35981d..b730126 100644 --- a/test/fixtures/normalize/include-multiple/output.css +++ b/test/fixtures/normalize/include-multiple/output.css @@ -17,7 +17,7 @@ html { -webkit-text-size-adjust: 100%; /* 3 */ } -/* HTML5 display definitions +/* Sections ========================================================================== */ /** * Remove the margin in all browsers (opinionated). @@ -26,50 +26,21 @@ body { margin: 0; } /** - * Add the correct display in IE <10. - * Add the correct display in Edge, IE, and Firefox for `details` or `summary`. - * Add the correct display in IE for `main`. + * Add the correct display in IE 9-. */ article, aside, -details, -figcaption, -figure, footer, header, -main, -menu, nav, -section, -summary { +section { display: block; } /** - * Add the correct display in IE <10. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ -audio, -canvas, -progress, -video { - display: inline-block; } - -/** - * Add the correct display and remove excess height in iOS 4-7. - */ -audio:not([controls]) { - display: none; - height: 0; } - -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ -progress { - vertical-align: baseline; } - -/** - * Add the correct display in IE <11, Safari <8, and Firefox <22. - * 1. Add the correct display in IE. - */ -template, -[hidden] { - display: none; } +h1 { + font-size: 2em; + /* Set 1 unit of vertical rhythm on the top and bottom margins. */ + margin: 0.75em 0; } diff --git a/test/fixtures/normalize/include-string/output.css b/test/fixtures/normalize/include-string/output.css index 89b6b57..49004bf 100644 --- a/test/fixtures/normalize/include-string/output.css +++ b/test/fixtures/normalize/include-string/output.css @@ -44,15 +44,6 @@ dfn { font-style: italic; } /** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ -h1 { - font-size: 2em; - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - margin: 0.75em 0; } - -/** * Add the correct background and color in IE <10. */ mark { diff --git a/test/fixtures/variables/default/output.css b/test/fixtures/variables/default/output.css index 66cfe7f..21b8a2b 100644 --- a/test/fixtures/variables/default/output.css +++ b/test/fixtures/variables/default/output.css @@ -17,7 +17,7 @@ html { -webkit-text-size-adjust: 100%; /* 3 */ } -/* HTML5 display definitions +/* Sections ========================================================================== */ /** * Remove the margin in all browsers (opinionated). @@ -26,53 +26,24 @@ body { margin: 0; } /** - * Add the correct display in IE <10. - * Add the correct display in Edge, IE, and Firefox for `details` or `summary`. - * Add the correct display in IE for `main`. + * Add the correct display in IE 9-. */ article, aside, -details, -figcaption, -figure, footer, header, -main, -menu, nav, -section, -summary { +section { display: block; } /** - * Add the correct display in IE <10. - */ -audio, -canvas, -progress, -video { - display: inline-block; } - -/** - * Add the correct display and remove excess height in iOS 4-7. - */ -audio:not([controls]) { - display: none; - height: 0; } - -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ -progress { - vertical-align: baseline; } - -/** - * Add the correct display in IE <11, Safari <8, and Firefox <22. - * 1. Add the correct display in IE. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ -template, -[hidden] { - display: none; } +h1 { + font-size: 2em; + /* Set 1 unit of vertical rhythm on the top and bottom margins. */ + margin: 0.75em 0; } /* Links ========================================================================== */ @@ -139,15 +110,6 @@ dfn { font-style: italic; } /** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ -h1 { - font-size: 2em; - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - margin: 0.75em 0; } - -/** * Add the correct background and color in IE <10. */ mark { @@ -180,6 +142,20 @@ sup { /* Embedded content ========================================================================== */ /** + * Add the correct display in IE <10. + */ +audio, +video { + display: inline-block; } + +/** + * Add the correct display and remove excess height in iOS 4-7. + */ +audio:not([controls]) { + display: none; + height: 0; } + +/** * Remove the border on images inside links in IE <11. */ img { @@ -390,7 +366,55 @@ optgroup { font-weight: bold; } /** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ +progress { + display: inline-block; + /* 1 */ + vertical-align: baseline; + /* 2 */ } + +/** * Remove the default vertical scrollbar in IE. */ textarea { overflow: auto; } + +/* Interactive + ========================================================================== */ +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ +details, +menu { + display: block; } + +/* + * Add the correct display in all browsers. + */ +summary { + display: list-item; } + +/* Scripting + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +canvas { + display: inline-block; } + +/** + * Add the correct display in IE. + */ +template { + display: none; } + +/* Hidden + ========================================================================== */ +/** + * Add the correct display in IE 10-. + */ +[hidden] { + display: none; } diff --git a/test/fixtures/variables/font/output.css b/test/fixtures/variables/font/output.css index 5adaedd..9236aef 100644 --- a/test/fixtures/variables/font/output.css +++ b/test/fixtures/variables/font/output.css @@ -18,7 +18,7 @@ html { -webkit-text-size-adjust: 100%; /* 3 */ } -/* HTML5 display definitions +/* Sections ========================================================================== */ /** * Remove the margin in all browsers (opinionated). @@ -27,53 +27,50 @@ body { margin: 0; } /** - * Add the correct display in IE <10. - * Add the correct display in Edge, IE, and Firefox for `details` or `summary`. - * Add the correct display in IE for `main`. + * Add the correct display in IE 9-. */ article, aside, -details, -figcaption, -figure, footer, header, -main, -menu, nav, -section, -summary { +section { display: block; } /** - * Add the correct display in IE <10. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ -audio, -canvas, -progress, -video { - display: inline-block; } +h1 { + font-size: 3rem; + line-height: 4.5rem; + /* Set 1 unit of vertical rhythm on the top and bottom margins. */ + margin: 1.5rem 0; } -/** - * Add the correct display and remove excess height in iOS 4-7. - */ -audio:not([controls]) { - display: none; - height: 0; } +h2 { + font-size: 2rem; + line-height: 3rem; + margin: 1.5rem 0; } -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ -progress { - vertical-align: baseline; } +h3 { + font-size: 1.5rem; + line-height: 3rem; + margin: 1.5rem 0; } -/** - * Add the correct display in IE <11, Safari <8, and Firefox <22. - * 1. Add the correct display in IE. - */ -template, -[hidden] { - display: none; } +h4 { + font-size: 0.9rem; + line-height: 1.5rem; + margin: 1.5rem 0; } + +h5 { + font-size: 0.75rem; + line-height: 1.5rem; + margin: 1.5rem 0; } + +h6 { + font-size: 0.5rem; + line-height: 1.5rem; + margin: 1.5rem 0; } /* Links ========================================================================== */ @@ -140,41 +137,6 @@ dfn { font-style: italic; } /** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ -h1 { - font-size: 3rem; - line-height: 4.5rem; - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - margin: 1.5rem 0; } - -h2 { - font-size: 2rem; - line-height: 3rem; - margin: 1.5rem 0; } - -h3 { - font-size: 1.5rem; - line-height: 3rem; - margin: 1.5rem 0; } - -h4 { - font-size: 0.9rem; - line-height: 1.5rem; - margin: 1.5rem 0; } - -h5 { - font-size: 0.75rem; - line-height: 1.5rem; - margin: 1.5rem 0; } - -h6 { - font-size: 0.5rem; - line-height: 1.5rem; - margin: 1.5rem 0; } - -/** * Add the correct background and color in IE <10. */ mark { @@ -207,6 +169,20 @@ sup { /* Embedded content ========================================================================== */ /** + * Add the correct display in IE <10. + */ +audio, +video { + display: inline-block; } + +/** + * Add the correct display and remove excess height in iOS 4-7. + */ +audio:not([controls]) { + display: none; + height: 0; } + +/** * Remove the border on images inside links in IE <11. */ img { @@ -453,7 +429,55 @@ optgroup { font-weight: bold; } /** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ +progress { + display: inline-block; + /* 1 */ + vertical-align: baseline; + /* 2 */ } + +/** * Remove the default vertical scrollbar in IE. */ textarea { overflow: auto; } + +/* Interactive + ========================================================================== */ +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ +details, +menu { + display: block; } + +/* + * Add the correct display in all browsers. + */ +summary { + display: list-item; } + +/* Scripting + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +canvas { + display: inline-block; } + +/** + * Add the correct display in IE. + */ +template { + display: none; } + +/* Hidden + ========================================================================== */ +/** + * Add the correct display in IE 10-. + */ +[hidden] { + display: none; } diff --git a/test/fixtures/variables/indent-amount/output.css b/test/fixtures/variables/indent-amount/output.css index b7158f8..ddca8b3 100644 --- a/test/fixtures/variables/indent-amount/output.css +++ b/test/fixtures/variables/indent-amount/output.css @@ -18,7 +18,7 @@ html { -webkit-text-size-adjust: 100%; /* 3 */ } -/* HTML5 display definitions +/* Sections ========================================================================== */ /** * Remove the margin in all browsers (opinionated). @@ -27,53 +27,50 @@ body { margin: 0; } /** - * Add the correct display in IE <10. - * Add the correct display in Edge, IE, and Firefox for `details` or `summary`. - * Add the correct display in IE for `main`. + * Add the correct display in IE 9-. */ article, aside, -details, -figcaption, -figure, footer, header, -main, -menu, nav, -section, -summary { +section { display: block; } /** - * Add the correct display in IE <10. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ -audio, -canvas, -progress, -video { - display: inline-block; } +h1 { + font-size: 2em; + line-height: 1.5em; + /* Set 1 unit of vertical rhythm on the top and bottom margins. */ + margin: 0.75em 0; } -/** - * Add the correct display and remove excess height in iOS 4-7. - */ -audio:not([controls]) { - display: none; - height: 0; } +h2 { + font-size: 1.5em; + line-height: 2em; + margin: 1em 0; } -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ -progress { - vertical-align: baseline; } +h3 { + font-size: 1.17em; + line-height: 1.28205em; + margin: 1.28205em 0; } -/** - * Add the correct display in IE <11, Safari <8, and Firefox <22. - * 1. Add the correct display in IE. - */ -template, -[hidden] { - display: none; } +h4 { + font-size: 1em; + line-height: 1.5em; + margin: 1.5em 0; } + +h5 { + font-size: 0.83em; + line-height: 1.80723em; + margin: 1.80723em 0; } + +h6 { + font-size: 0.67em; + line-height: 2.23881em; + margin: 2.23881em 0; } /* Links ========================================================================== */ @@ -140,41 +137,6 @@ dfn { font-style: italic; } /** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ -h1 { - font-size: 2em; - line-height: 1.5em; - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - margin: 0.75em 0; } - -h2 { - font-size: 1.5em; - line-height: 2em; - margin: 1em 0; } - -h3 { - font-size: 1.17em; - line-height: 1.28205em; - margin: 1.28205em 0; } - -h4 { - font-size: 1em; - line-height: 1.5em; - margin: 1.5em 0; } - -h5 { - font-size: 0.83em; - line-height: 1.80723em; - margin: 1.80723em 0; } - -h6 { - font-size: 0.67em; - line-height: 2.23881em; - margin: 2.23881em 0; } - -/** * Add the correct background and color in IE <10. */ mark { @@ -207,6 +169,20 @@ sup { /* Embedded content ========================================================================== */ /** + * Add the correct display in IE <10. + */ +audio, +video { + display: inline-block; } + +/** + * Add the correct display and remove excess height in iOS 4-7. + */ +audio:not([controls]) { + display: none; + height: 0; } + +/** * Remove the border on images inside links in IE <11. */ img { @@ -453,7 +429,55 @@ optgroup { font-weight: bold; } /** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ +progress { + display: inline-block; + /* 1 */ + vertical-align: baseline; + /* 2 */ } + +/** * Remove the default vertical scrollbar in IE. */ textarea { overflow: auto; } + +/* Interactive + ========================================================================== */ +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ +details, +menu { + display: block; } + +/* + * Add the correct display in all browsers. + */ +summary { + display: list-item; } + +/* Scripting + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +canvas { + display: inline-block; } + +/** + * Add the correct display in IE. + */ +template { + display: none; } + +/* Hidden + ========================================================================== */ +/** + * Add the correct display in IE 10-. + */ +[hidden] { + display: none; } |