diff options
author | JohnAlbin <virtually.johnalbin@gmail.com> | 2016-10-17 14:26:30 +0300 |
---|---|---|
committer | JohnAlbin <virtually.johnalbin@gmail.com> | 2016-10-24 07:51:42 +0300 |
commit | 7b240bf2df78e9c89574597bf364afdd944d85e3 (patch) | |
tree | 7a7d64c4c9ee684903dbbfeebf8451dc4e58c831 | |
parent | ec9f45390ac772a79de35ef8bc89c1b7ed08ec8a (diff) |
Update "grouping" section. #88
20 files changed, 1265 insertions, 898 deletions
diff --git a/fork-versions/default/_normalize.scss b/fork-versions/default/_normalize.scss index 3e98e9e..5d99608 100644 --- a/fork-versions/default/_normalize.scss +++ b/fork-versions/default/_normalize.scss @@ -115,6 +115,107 @@ h1 { } } +/* Grouping content + ========================================================================== */ + +@if $normalize-vertical-rhythm { + /** + * Set 1 unit of vertical rhythm on the top and bottom margin. + */ + + blockquote { + @include normalize-margin(1 $indent-amount); + } + + dl, + ol, + ul { + @include normalize-margin(1 0); + } + + /** + * Turn off margins on nested lists. + */ + + ol, + ul { + ol, + ul { + margin: 0; + } + } + + dd { + margin: 0 0 0 $indent-amount; + } + + ol, + ul { + padding: 0 0 0 $indent-amount; + } +} + +/** + * Add the correct display in IE 9-. + */ + +figcaption, +figure { + display: block; +} + +/** + * Add the correct margin in IE 8. + */ + +figure { + @include normalize-margin(1 $indent-amount); +} + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + 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. + */ + + p, + pre { + @include normalize-margin(1 0); + } +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +%monospace { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +pre { + @extend %monospace; +} + /* Links ========================================================================== */ @@ -170,17 +271,10 @@ strong { font-weight: bolder; } -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -%monospace, code, kbd, samp { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ + @extend %monospace; } /** @@ -266,99 +360,6 @@ svg:not(:root) { overflow: hidden; } -/* Grouping content - ========================================================================== */ - -@if $normalize-vertical-rhythm { - /** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ - - blockquote { - @include normalize-margin(1 $indent-amount); - } - - dl, - menu, - ol, - ul { - @include normalize-margin(1 0); - } - - /** - * Turn off margins on nested lists. - */ - - ol, - ul { - ol, - ul { - margin: 0; - } - } - - dd { - margin: 0 0 0 $indent-amount; - } - - menu, - ol, - ul { - padding: 0 0 0 $indent-amount; - } -} - -/** - * Add the correct display in IE 9-. - */ - -figcaption, -figure { - display: block; -} - -/** - * Add the correct margin in IE 8. - */ - -figure { - @include normalize-margin(1 $indent-amount); -} - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ - -hr { - box-sizing: content-box; /* 1 */ - height: 0; /* 1 */ - 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. - */ - - p, - pre { - @include normalize-margin(1 0); - } -} - -pre { - @extend %monospace; -} - /* Forms ========================================================================== */ @@ -572,12 +573,10 @@ textarea { ========================================================================== */ /* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. + * Add the correct display in Edge, IE, and Firefox. */ -details, /* 1 */ -menu { +details { display: block; } @@ -589,6 +588,35 @@ summary { display: list-item; } + +/* + * Add the correct display in IE 9-. + */ + +menu { + display: block; + + @if $normalize-vertical-rhythm { + /* + * 1. Set 1 unit of vertical rhythm on the top and bottom margin. + * 2. Set consistent space for the list style image. + */ + + @include normalize-margin(1 0); /* 1 */ + padding: 0 0 0 $indent-amount; /* 2 */ + + /** + * Turn off margins on nested lists. + */ + + menu &, + ol &, + ul & { + margin: 0; + } + } +} + /* Scripting ========================================================================== */ diff --git a/fork-versions/deprecated-compass/_normalize.scss b/fork-versions/deprecated-compass/_normalize.scss index 7f89dda..94a1c89 100644 --- a/fork-versions/deprecated-compass/_normalize.scss +++ b/fork-versions/deprecated-compass/_normalize.scss @@ -122,6 +122,107 @@ h1 { } } +/* Grouping content + ========================================================================== */ + +@if $normalize-vertical-rhythm { + /** + * Set 1 unit of vertical rhythm on the top and bottom margin. + */ + + blockquote { + @include output-rhythm(margin, rhythm(1) $indent-amount); + } + + dl, + ol, + ul { + @include output-rhythm(margin, rhythm(1) 0); + } + + /** + * Turn off margins on nested lists. + */ + + ol, + ul { + ol, + ul { + margin: 0; + } + } + + dd { + margin: 0 0 0 $indent-amount; + } + + ol, + ul { + padding: 0 0 0 $indent-amount; + } +} + +/** + * Add the correct display in IE 9-. + */ + +figcaption, +figure { + display: block; +} + +/** + * Add the correct margin in IE 8. + */ + +figure { + @include output-rhythm(margin, rhythm(1) $indent-amount); +} + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + @include box-sizing(content-box); /* 1 */ + height: 0; /* 1 */ + 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. + */ + + p, + pre { + @include output-rhythm(margin, rhythm(1) 0); + } +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +%monospace { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +pre { + @extend %monospace; +} + /* Links ========================================================================== */ @@ -177,17 +278,10 @@ strong { font-weight: bolder; } -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -%monospace, code, kbd, samp { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ + @extend %monospace; } /** @@ -273,99 +367,6 @@ svg:not(:root) { overflow: hidden; } -/* Grouping content - ========================================================================== */ - -@if $normalize-vertical-rhythm { - /** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ - - blockquote { - @include output-rhythm(margin, rhythm(1) $indent-amount); - } - - dl, - menu, - ol, - ul { - @include output-rhythm(margin, rhythm(1) 0); - } - - /** - * Turn off margins on nested lists. - */ - - ol, - ul { - ol, - ul { - margin: 0; - } - } - - dd { - margin: 0 0 0 $indent-amount; - } - - menu, - ol, - ul { - padding: 0 0 0 $indent-amount; - } -} - -/** - * Add the correct display in IE 9-. - */ - -figcaption, -figure { - display: block; -} - -/** - * Add the correct margin in IE 8. - */ - -figure { - @include output-rhythm(margin, rhythm(1) $indent-amount); -} - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ - -hr { - @include box-sizing(content-box); /* 1 */ - height: 0; /* 1 */ - 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. - */ - - p, - pre { - @include output-rhythm(margin, rhythm(1) 0); - } -} - -pre { - @extend %monospace; -} - /* Forms ========================================================================== */ @@ -583,12 +584,10 @@ textarea { ========================================================================== */ /* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. + * Add the correct display in Edge, IE, and Firefox. */ -details, /* 1 */ -menu { +details { display: block; } @@ -600,6 +599,34 @@ summary { display: list-item; } +/* + * Add the correct display in IE 9-. + */ + +menu { + display: block; + + @if $normalize-vertical-rhythm { + /* + * 1. Set 1 unit of vertical rhythm on the top and bottom margin. + * 2. Set consistent space for the list style image. + */ + + @include output-rhythm(margin, rhythm(1) 0); /* 1 */ + padding: 0 0 0 $indent-amount; /* 2 */ + + /** + * Turn off margins on nested lists. + */ + + menu &, + ol &, + ul & { + margin: 0; + } + } +} + /* Scripting ========================================================================== */ diff --git a/fork-versions/typey-chroma-kss/base/_normalize.scss b/fork-versions/typey-chroma-kss/base/_normalize.scss index 1d4a83f..40f1662 100644 --- a/fork-versions/typey-chroma-kss/base/_normalize.scss +++ b/fork-versions/typey-chroma-kss/base/_normalize.scss @@ -11,9 +11,9 @@ // Normalize-scss is broken into modular pieces to make it easier to edit. @import 'document/document'; @import 'sections/sections'; +@import 'grouping/grouping'; @import 'links/links'; @import 'text/text'; -@import 'grouping/grouping'; @import 'embedded/embedded'; @import 'forms/forms'; @import 'tables/tables'; diff --git a/fork-versions/typey-chroma-kss/base/grouping/_grouping.scss b/fork-versions/typey-chroma-kss/base/grouping/_grouping.scss index 820489c..bef19f5 100644 --- a/fork-versions/typey-chroma-kss/base/grouping/_grouping.scss +++ b/fork-versions/typey-chroma-kss/base/grouping/_grouping.scss @@ -63,7 +63,6 @@ blockquote { // Style guide: base.grouping.lists.dl dl, -menu, ol, ul { @include margin(1 0); @@ -90,7 +89,6 @@ dd { } } -menu, ol, ul { padding: 0 0 0 $indent-amount; @@ -115,10 +113,13 @@ ul { figure { // Add the correct margin in IE 8. @include margin(1 $indent-amount); + // Add the correct display in IE 9-. + display: block; } figcaption { - // Add your styles. + // Add the correct display in IE 9-. + display: block; } // Horizontal rule @@ -140,6 +141,17 @@ hr { overflow: visible; } +// Main +// +// The `<main>` element represents the main content of the page. +// +// Style guide: base.grouping.main + +main { + // Add the correct display in IE. + display: block; +} + // Body copy // // The default `font-size` and `line-height` properties are applied to the @@ -167,6 +179,14 @@ pre { // // Style guide: base.grouping.pre +%monospace { + // Correct the inheritance and scaling of font size in all browsers. + // The font-family value ends with ", serif". + @include typeface(monospace); + // Correct the odd `em` font sizing in all browsers. + font-size: 1em; +} + pre { @extend %monospace; } diff --git a/fork-versions/typey-chroma-kss/base/interactive/_interactive.scss b/fork-versions/typey-chroma-kss/base/interactive/_interactive.scss index 8e0818d..60bf832 100644 --- a/fork-versions/typey-chroma-kss/base/interactive/_interactive.scss +++ b/fork-versions/typey-chroma-kss/base/interactive/_interactive.scss @@ -21,6 +21,21 @@ summary { // Style guide: base.interactive.menu menu { + // Set 1 unit of vertical rhythm on the top and bottom margin. + @include margin(1 0); // Add the correct display in IE 9-. display: block; + // Set consistent space for the list style image. + padding: 0 0 0 $indent-amount; + + @include rtl { + padding: 0 $indent-amount 0 0; + } + + // Turn off margins on nested lists. + menu &, + ol &, + ul & { + margin: 0; + } } diff --git a/fork-versions/typey-chroma-kss/base/text/_text.scss b/fork-versions/typey-chroma-kss/base/text/_text.scss index a8b0962..846fee0 100644 --- a/fork-versions/typey-chroma-kss/base/text/_text.scss +++ b/fork-versions/typey-chroma-kss/base/text/_text.scss @@ -82,16 +82,11 @@ cite { // // Style guide: base.text.code -%monospace, code, kbd, samp, var { - // Correct the inheritance and scaling of font size in all browsers. - // The font-family value ends with ", serif". - @include typeface(monospace); - // Correct the odd `em` font sizing in all browsers. - font-size: 1em; + @extend %monospace; } // Deleted text diff --git a/fork-versions/typey/_normalize.scss b/fork-versions/typey/_normalize.scss index b8bd894..ded144c 100644 --- a/fork-versions/typey/_normalize.scss +++ b/fork-versions/typey/_normalize.scss @@ -84,6 +84,103 @@ h6 { @include margin(1 0, xs); } +/* Grouping content + ========================================================================== */ + +/** + * Set 1 unit of vertical rhythm on the top and bottom margin. + */ + +blockquote { + @include margin(1 $indent-amount); +} + +dl, +ol, +ul { + @include margin(1 0); +} + +/** + * Turn off margins on nested lists. + */ + +ol, +ul { + ol, + ul { + margin: 0; + } +} + +dd { + margin: 0 0 0 $indent-amount; +} + +ol, +ul { + padding: 0 0 0 $indent-amount; +} + +/** + * Add the correct display in IE 9-. + */ + +figcaption, +figure { + display: block; +} + +/** + * Add the correct margin in IE 8. + */ + +figure { + @include margin(1 $indent-amount); +} + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * Add the correct display in IE. + */ + +main { + display: block; +} + +/** + * Set 1 unit of vertical rhythm on the top and bottom margin. + */ + +p, +pre { + @include margin(1 0); +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +%monospace { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +pre { + @extend %monospace; +} + /* Links ========================================================================== */ @@ -139,17 +236,10 @@ strong { font-weight: bolder; } -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -%monospace, code, kbd, samp { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ + @extend %monospace; } /** @@ -235,95 +325,6 @@ svg:not(:root) { overflow: hidden; } -/* Grouping content - ========================================================================== */ - -/** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ - -blockquote { - @include margin(1 $indent-amount); -} - -dl, -menu, -ol, -ul { - @include margin(1 0); -} - -/** - * Turn off margins on nested lists. - */ - -ol, -ul { - ol, - ul { - margin: 0; - } -} - -dd { - margin: 0 0 0 $indent-amount; -} - -menu, -ol, -ul { - padding: 0 0 0 $indent-amount; -} - -/** - * Add the correct display in IE 9-. - */ - -figcaption, -figure { - display: block; -} - -/** - * Add the correct margin in IE 8. - */ - -figure { - @include margin(1 $indent-amount); -} - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ - -hr { - box-sizing: content-box; /* 1 */ - height: 0; /* 1 */ - overflow: visible; /* 2 */ -} - -/** - * Add the correct display in IE. - */ - -main { - display: block; -} - -/** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ - -p, -pre { - @include margin(1 0); -} - -pre { - @extend %monospace; -} - /* Forms ========================================================================== */ @@ -538,12 +539,10 @@ textarea { ========================================================================== */ /* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. + * Add the correct display in Edge, IE, and Firefox. */ -details, /* 1 */ -menu { +details { display: block; } @@ -555,6 +554,28 @@ summary { display: list-item; } +/* + * 1. Set 1 unit of vertical rhythm on the top and bottom margin. + * 2. Add the correct display in IE 9-. + * 3. Set consistent space for the list style image. + */ + +menu { + @include margin(1 0); /* 1 */ + display: block; /* 2 */ + padding: 0 0 0 $indent-amount; /* 3 */ + + /** + * Turn off margins on nested lists. + */ + + menu &, + ol &, + ul & { + margin: 0; + } +} + /* Scripting ========================================================================== */ diff --git a/sass/normalize/_normalize-mixin.scss b/sass/normalize/_normalize-mixin.scss index bf1df1a..683a9ca 100644 --- a/sass/normalize/_normalize-mixin.scss +++ b/sass/normalize/_normalize-mixin.scss @@ -146,6 +146,105 @@ } } + @if _normalize-include(grouping) { + /* Grouping content + ========================================================================== */ + + @if $normalize-vertical-rhythm { + /** + * Set 1 unit of vertical rhythm on the top and bottom margin. + */ + + blockquote { + @include normalize-margin(1 $indent-amount); + } + + dl, + ol, + ul { + @include normalize-margin(1 0); + } + + /** + * Turn off margins on nested lists. + */ + + ol, + ul { + ol, + ul { + margin: 0; + } + } + + dd { + margin: 0 0 0 $indent-amount; + } + + ol, + ul { + padding: 0 0 0 $indent-amount; + } + } + + /** + * Add the correct display in IE 9-. + */ + + figcaption, + figure { + display: block; + } + + /** + * Add the correct margin in IE 8. + */ + + figure { + @include normalize-margin(1 $indent-amount); + } + + /** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + + hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + 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. + */ + + p, + pre { + @include normalize-margin(1 0); + } + } + + /** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + + pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ + } + } + @if _normalize-include(links) { /* Links ========================================================================== */ @@ -212,8 +311,8 @@ code, kbd, samp { - font-family: monospace, monospace; - font-size: 1em; + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ } /** @@ -302,85 +401,6 @@ } } - @if _normalize-include(grouping) { - /* Grouping content - ========================================================================== */ - - @if $normalize-vertical-rhythm { - /** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ - - blockquote { - @include normalize-margin(1 $indent-amount); - } - - dl, - menu, - ol, - ul { - @include normalize-margin(1 0); - } - - /** - * Turn off margins on nested lists. - */ - - ol, - ul { - ol, - ul { - margin: 0; - } - } - - dd { - margin: 0 0 0 $indent-amount; - } - - menu, - ol, - ul { - padding: 0 0 0 $indent-amount; - } - } - - /** - * Add the correct margin in IE 8. - */ - - figure { - @include normalize-margin(1 $indent-amount); - } - - /** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ - - hr { - box-sizing: content-box; /* 1 */ - height: 0; /* 1 */ - overflow: visible; /* 2 */ - } - - @if $normalize-vertical-rhythm { - /** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ - - p, - pre { - @include normalize-margin(1 0); - } - } - - pre { - font-family: monospace, monospace; - font-size: 1em; - } - } - @if _normalize-include(forms) { /* Forms ========================================================================== */ @@ -597,12 +617,10 @@ ========================================================================== */ /* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. + * Add the correct display in Edge, IE, and Firefox. */ - details, /* 1 */ - menu { + details { display: block; } @@ -613,6 +631,34 @@ summary { display: list-item; } + + /* + * Add the correct display in IE 9-. + */ + + menu { + display: block; + + @if $normalize-vertical-rhythm { + /* + * 1. Set 1 unit of vertical rhythm on the top and bottom margin. + * 2. Set consistent space for the list style image. + */ + + @include normalize-margin(1 0); /* 1 */ + padding: 0 0 0 $indent-amount; /* 2 */ + + /** + * Turn off margins on nested lists. + */ + + menu &, + ol &, + ul & { + margin: 0; + } + } + } } @if _normalize-include(scripting) { diff --git a/test/fixtures/fork-versions/default/output.css b/test/fixtures/fork-versions/default/output.css index 222571b..00946c1 100644 --- a/test/fixtures/fork-versions/default/output.css +++ b/test/fixtures/fork-versions/default/output.css @@ -45,6 +45,51 @@ h1 { /* Set 1 unit of vertical rhythm on the top and bottom margins. */ margin: 0.75em 0; } +/* Grouping content + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +figcaption, +figure { + display: block; } + +/** + * Add the correct margin in IE 8. + */ +figure { + margin: 1.5em 40px; } + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ +hr { + box-sizing: content-box; + /* 1 */ + height: 0; + /* 1 */ + overflow: visible; + /* 2 */ } + +/** + * Add the correct display in IE. + */ +main { + display: block; } + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ +pre, code, +kbd, +samp { + font-family: monospace, monospace; + /* 1 */ + font-size: 1em; + /* 2 */ } + /* Links ========================================================================== */ /** @@ -94,19 +139,6 @@ strong { font-weight: bolder; } /** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ -pre, -code, -kbd, -samp { - font-family: monospace, monospace; - /* 1 */ - font-size: 1em; - /* 2 */ } - -/** * Add the correct font style in Android <4.4. */ dfn { @@ -170,39 +202,6 @@ img { svg:not(:root) { overflow: hidden; } -/* Grouping content - ========================================================================== */ -/** - * Add the correct display in IE 9-. - */ -figcaption, -figure { - display: block; } - -/** - * Add the correct margin in IE 8. - */ -figure { - margin: 1.5em 40px; } - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ -hr { - box-sizing: content-box; - /* 1 */ - height: 0; - /* 1 */ - overflow: visible; - /* 2 */ } - -/** - * Add the correct display in IE. - */ -main { - display: block; } - /* Forms ========================================================================== */ /** @@ -396,11 +395,9 @@ textarea { /* Interactive ========================================================================== */ /* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. + * Add the correct display in Edge, IE, and Firefox. */ -details, -menu { +details { display: block; } /* @@ -409,6 +406,12 @@ menu { summary { display: list-item; } +/* + * Add the correct display in IE 9-. + */ +menu { + display: block; } + /* Scripting ========================================================================== */ /** diff --git a/test/fixtures/fork-versions/deprecated-compass/output.css b/test/fixtures/fork-versions/deprecated-compass/output.css index c8fc711..f33cd97 100644 --- a/test/fixtures/fork-versions/deprecated-compass/output.css +++ b/test/fixtures/fork-versions/deprecated-compass/output.css @@ -55,6 +55,53 @@ h1 { margin-top: 0.75em; margin-bottom: 0.75em; } +/* Grouping content + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +figcaption, +figure { + display: block; } + +/** + * Add the correct margin in IE 8. + */ +figure { + margin: 1.5em 40px; } + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ +hr { + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; + box-sizing: content-box; + /* 1 */ + height: 0; + /* 1 */ + overflow: visible; + /* 2 */ } + +/** + * Add the correct display in IE. + */ +main { + display: block; } + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ +pre, code, +kbd, +samp { + font-family: monospace, monospace; + /* 1 */ + font-size: 1em; + /* 2 */ } + /* Links ========================================================================== */ /** @@ -104,19 +151,6 @@ strong { font-weight: bolder; } /** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ -pre, -code, -kbd, -samp { - font-family: monospace, monospace; - /* 1 */ - font-size: 1em; - /* 2 */ } - -/** * Add the correct font style in Android <4.4. */ dfn { @@ -180,41 +214,6 @@ img { svg:not(:root) { overflow: hidden; } -/* Grouping content - ========================================================================== */ -/** - * Add the correct display in IE 9-. - */ -figcaption, -figure { - display: block; } - -/** - * Add the correct margin in IE 8. - */ -figure { - margin: 1.5em 40px; } - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ -hr { - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; - box-sizing: content-box; - /* 1 */ - height: 0; - /* 1 */ - overflow: visible; - /* 2 */ } - -/** - * Add the correct display in IE. - */ -main { - display: block; } - /* Forms ========================================================================== */ /** @@ -422,11 +421,9 @@ textarea { /* Interactive ========================================================================== */ /* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. + * Add the correct display in Edge, IE, and Firefox. */ -details, -menu { +details { display: block; } /* @@ -435,6 +432,12 @@ menu { summary { display: list-item; } +/* + * Add the correct display in IE 9-. + */ +menu { + display: block; } + /* Scripting ========================================================================== */ /** diff --git a/test/fixtures/fork-versions/typey-chroma-kss/output.css b/test/fixtures/fork-versions/typey-chroma-kss/output.css index bed0d1b..4bf733c 100644 --- a/test/fixtures/fork-versions/typey-chroma-kss/output.css +++ b/test/fixtures/fork-versions/typey-chroma-kss/output.css @@ -61,6 +61,61 @@ h6 { margin-top: 1.5rem; margin-bottom: 1.5rem; } +.divider, +hr { + margin: 1.5rem 0; + border: 0; + border-top: 1px solid #cccccc; } + .divider > :first-child, hr > :first-child { + margin-top: 1.5rem; } + +blockquote { + margin: 1.5rem 2rem; } + +dl, +ol, +ul { + margin: 1.5rem 0; } + +ol ol, +ol ul, +ul ol, +ul ul { + margin: 0; } + +dd { + margin: 0 0 0 32px; } + +ol, +ul { + padding: 0 0 0 32px; } + +figure { + margin: 1.5rem 2rem; + display: block; } + +figcaption { + display: block; } + +hr { + box-sizing: content-box; + height: 0; + overflow: visible; } + +main { + display: block; } + +p, +pre { + margin: 1.5rem 0; } + +pre, code, +kbd, +samp, +var { + font-family: Menlo, "DejaVu Sans Mono", "Ubuntu Mono", Courier, "Courier New", monospace, sans-serif; + font-size: 1em; } + a { color: #0072b9; -webkit-text-decoration-skip: objects; } @@ -106,14 +161,6 @@ b, strong { font-weight: bolder; } -pre, -code, -kbd, -samp, -var { - font-family: Menlo, "DejaVu Sans Mono", "Ubuntu Mono", Courier, "Courier New", monospace, sans-serif; - font-size: 1em; } - dfn { font-style: italic; } @@ -137,49 +184,6 @@ sub { sup { top: -.5em; } -.divider, -hr { - margin: 1.5rem 0; - border: 0; - border-top: 1px solid #cccccc; } - .divider > :first-child, hr > :first-child { - margin-top: 1.5rem; } - -blockquote { - margin: 1.5rem 2rem; } - -dl, -menu, -ol, -ul { - margin: 1.5rem 0; } - -ol ol, -ol ul, -ul ol, -ul ul { - margin: 0; } - -dd { - margin: 0 0 0 32px; } - -menu, -ol, -ul { - padding: 0 0 0 32px; } - -figure { - margin: 1.5rem 2rem; } - -hr { - box-sizing: content-box; - height: 0; - overflow: visible; } - -p, -pre { - margin: 1.5rem 0; } - audio { display: inline-block; } @@ -355,7 +359,13 @@ summary { display: list-item; } menu { - display: block; } + margin: 1.5rem 0; + display: block; + padding: 0 0 0 32px; } + menu menu, + ol menu, + ul menu { + margin: 0; } canvas { display: inline-block; } diff --git a/test/fixtures/fork-versions/typey/output.css b/test/fixtures/fork-versions/typey/output.css index 949d267..3894ad5 100644 --- a/test/fixtures/fork-versions/typey/output.css +++ b/test/fixtures/fork-versions/typey/output.css @@ -75,6 +75,85 @@ h6 { line-height: 1.5rem; margin: 1.5rem 0; } +/* Grouping content + ========================================================================== */ +/** + * Set 1 unit of vertical rhythm on the top and bottom margin. + */ +blockquote { + margin: 1.5rem 2.5rem; } + +dl, +ol, +ul { + margin: 1.5rem 0; } + +/** + * Turn off margins on nested lists. + */ +ol ol, +ol ul, +ul ol, +ul ul { + margin: 0; } + +dd { + margin: 0 0 0 40px; } + +ol, +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 { + margin: 1.5rem 2.5rem; } + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ +hr { + box-sizing: content-box; + /* 1 */ + height: 0; + /* 1 */ + overflow: visible; + /* 2 */ } + +/** + * Add the correct display in IE. + */ +main { + display: block; } + +/** + * Set 1 unit of vertical rhythm on the top and bottom margin. + */ +p, +pre { + margin: 1.5rem 0; } + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ +pre, code, +kbd, +samp { + font-family: monospace, monospace; + /* 1 */ + font-size: 1em; + /* 2 */ } + /* Links ========================================================================== */ /** @@ -124,19 +203,6 @@ strong { font-weight: bolder; } /** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ -pre, -code, -kbd, -samp { - font-family: monospace, monospace; - /* 1 */ - font-size: 1em; - /* 2 */ } - -/** * Add the correct font style in Android <4.4. */ dfn { @@ -200,75 +266,6 @@ img { svg:not(:root) { overflow: hidden; } -/* Grouping content - ========================================================================== */ -/** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ -blockquote { - margin: 1.5rem 2.5rem; } - -dl, -menu, -ol, -ul { - margin: 1.5rem 0; } - -/** - * Turn off margins on nested lists. - */ -ol ol, -ol ul, -ul ol, -ul ul { - margin: 0; } - -dd { - margin: 0 0 0 40px; } - -menu, -ol, -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 { - margin: 1.5rem 2.5rem; } - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ -hr { - box-sizing: content-box; - /* 1 */ - height: 0; - /* 1 */ - overflow: visible; - /* 2 */ } - -/** - * Add the correct display in IE. - */ -main { - display: block; } - -/** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ -p, -pre { - margin: 1.5rem 0; } - /* Forms ========================================================================== */ /** @@ -462,11 +459,9 @@ textarea { /* Interactive ========================================================================== */ /* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. + * Add the correct display in Edge, IE, and Firefox. */ -details, -menu { +details { display: block; } /* @@ -475,6 +470,26 @@ menu { summary { display: list-item; } +/* + * 1. Set 1 unit of vertical rhythm on the top and bottom margin. + * 2. Add the correct display in IE 9-. + * 3. Set consistent space for the list style image. + */ +menu { + margin: 1.5rem 0; + /* 1 */ + display: block; + /* 2 */ + padding: 0 0 0 40px; + /* 3 */ + /** + * Turn off margins on nested lists. + */ } + menu menu, + ol menu, + ul menu { + margin: 0; } + /* Scripting ========================================================================== */ /** diff --git a/test/fixtures/import-now/output.css b/test/fixtures/import-now/output.css index 21b8a2b..f37aec6 100644 --- a/test/fixtures/import-now/output.css +++ b/test/fixtures/import-now/output.css @@ -45,6 +45,49 @@ h1 { /* Set 1 unit of vertical rhythm on the top and bottom margins. */ margin: 0.75em 0; } +/* Grouping content + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +figcaption, +figure { + display: block; } + +/** + * Add the correct margin in IE 8. + */ +figure { + margin: 1.5em 40px; } + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ +hr { + box-sizing: content-box; + /* 1 */ + height: 0; + /* 1 */ + overflow: visible; + /* 2 */ } + +/** + * Add the correct display in IE. + */ +main { + display: block; } + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ +pre { + font-family: monospace, monospace; + /* 1 */ + font-size: 1em; + /* 2 */ } + /* Links ========================================================================== */ /** @@ -101,7 +144,9 @@ code, kbd, samp { font-family: monospace, monospace; - font-size: 1em; } + /* 1 */ + font-size: 1em; + /* 2 */ } /** * Add the correct font style in Android <4.4. @@ -167,30 +212,6 @@ img { svg:not(:root) { overflow: hidden; } -/* Grouping content - ========================================================================== */ -/** - * Add the correct margin in IE 8. - */ -figure { - margin: 1.5em 40px; } - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ -hr { - box-sizing: content-box; - /* 1 */ - height: 0; - /* 1 */ - overflow: visible; - /* 2 */ } - -pre { - font-family: monospace, monospace; - font-size: 1em; } - /* Forms ========================================================================== */ /** @@ -384,11 +405,9 @@ textarea { /* Interactive ========================================================================== */ /* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. + * Add the correct display in Edge, IE, and Firefox. */ -details, -menu { +details { display: block; } /* @@ -397,6 +416,12 @@ menu { summary { display: list-item; } +/* + * Add the correct display in IE 9-. + */ +menu { + display: block; } + /* Scripting ========================================================================== */ /** diff --git a/test/fixtures/normalize/exclude-multiple/output.css b/test/fixtures/normalize/exclude-multiple/output.css index d942234..a6cb81c 100644 --- a/test/fixtures/normalize/exclude-multiple/output.css +++ b/test/fixtures/normalize/exclude-multiple/output.css @@ -101,7 +101,9 @@ code, kbd, samp { font-family: monospace, monospace; - font-size: 1em; } + /* 1 */ + font-size: 1em; + /* 2 */ } /** * Add the correct font style in Android <4.4. @@ -332,11 +334,9 @@ textarea { /* Interactive ========================================================================== */ /* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. + * Add the correct display in Edge, IE, and Firefox. */ -details, -menu { +details { display: block; } /* @@ -345,6 +345,12 @@ menu { summary { display: list-item; } +/* + * Add the correct display in IE 9-. + */ +menu { + display: block; } + /* Scripting ========================================================================== */ /** diff --git a/test/fixtures/normalize/exclude-single/output.css b/test/fixtures/normalize/exclude-single/output.css index 2d72c0d..a2d24b0 100644 --- a/test/fixtures/normalize/exclude-single/output.css +++ b/test/fixtures/normalize/exclude-single/output.css @@ -45,6 +45,49 @@ h1 { /* Set 1 unit of vertical rhythm on the top and bottom margins. */ margin: 0.75em 0; } +/* Grouping content + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +figcaption, +figure { + display: block; } + +/** + * Add the correct margin in IE 8. + */ +figure { + margin: 1.5em 40px; } + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ +hr { + box-sizing: content-box; + /* 1 */ + height: 0; + /* 1 */ + overflow: visible; + /* 2 */ } + +/** + * Add the correct display in IE. + */ +main { + display: block; } + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ +pre { + font-family: monospace, monospace; + /* 1 */ + font-size: 1em; + /* 2 */ } + /* Links ========================================================================== */ /** @@ -101,7 +144,9 @@ code, kbd, samp { font-family: monospace, monospace; - font-size: 1em; } + /* 1 */ + font-size: 1em; + /* 2 */ } /** * Add the correct font style in Android <4.4. @@ -167,38 +212,12 @@ img { svg:not(:root) { overflow: hidden; } -/* Grouping content - ========================================================================== */ -/** - * Add the correct margin in IE 8. - */ -figure { - margin: 1.5em 40px; } - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ -hr { - box-sizing: content-box; - /* 1 */ - height: 0; - /* 1 */ - overflow: visible; - /* 2 */ } - -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. + * Add the correct display in Edge, IE, and Firefox. */ -details, -menu { +details { display: block; } /* @@ -207,6 +226,12 @@ menu { summary { display: list-item; } +/* + * Add the correct display in IE 9-. + */ +menu { + display: block; } + /* Scripting ========================================================================== */ /** diff --git a/test/fixtures/normalize/exclude-string/output.css b/test/fixtures/normalize/exclude-string/output.css index 9d9c2e0..b7f5068 100644 --- a/test/fixtures/normalize/exclude-string/output.css +++ b/test/fixtures/normalize/exclude-string/output.css @@ -45,6 +45,49 @@ h1 { /* Set 1 unit of vertical rhythm on the top and bottom margins. */ margin: 0.75em 0; } +/* Grouping content + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +figcaption, +figure { + display: block; } + +/** + * Add the correct margin in IE 8. + */ +figure { + margin: 1.5em 40px; } + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ +hr { + box-sizing: content-box; + /* 1 */ + height: 0; + /* 1 */ + overflow: visible; + /* 2 */ } + +/** + * Add the correct display in IE. + */ +main { + display: block; } + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ +pre { + font-family: monospace, monospace; + /* 1 */ + font-size: 1em; + /* 2 */ } + /* Links ========================================================================== */ /** @@ -101,7 +144,9 @@ code, kbd, samp { font-family: monospace, monospace; - font-size: 1em; } + /* 1 */ + font-size: 1em; + /* 2 */ } /** * Add the correct font style in Android <4.4. @@ -167,30 +212,6 @@ img { svg:not(:root) { overflow: hidden; } -/* Grouping content - ========================================================================== */ -/** - * Add the correct margin in IE 8. - */ -figure { - margin: 1.5em 40px; } - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ -hr { - box-sizing: content-box; - /* 1 */ - height: 0; - /* 1 */ - overflow: visible; - /* 2 */ } - -pre { - font-family: monospace, monospace; - font-size: 1em; } - /* Forms ========================================================================== */ /** @@ -384,11 +405,9 @@ textarea { /* Interactive ========================================================================== */ /* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. + * Add the correct display in Edge, IE, and Firefox. */ -details, -menu { +details { display: block; } /* @@ -397,6 +416,12 @@ menu { summary { display: list-item; } +/* + * Add the correct display in IE 9-. + */ +menu { + display: block; } + /* Hidden ========================================================================== */ /** diff --git a/test/fixtures/normalize/include-string/output.css b/test/fixtures/normalize/include-string/output.css index 49004bf..1da5b6a 100644 --- a/test/fixtures/normalize/include-string/output.css +++ b/test/fixtures/normalize/include-string/output.css @@ -35,7 +35,9 @@ code, kbd, samp { font-family: monospace, monospace; - font-size: 1em; } + /* 1 */ + font-size: 1em; + /* 2 */ } /** * Add the correct font style in Android <4.4. diff --git a/test/fixtures/variables/default/output.css b/test/fixtures/variables/default/output.css index 21b8a2b..f37aec6 100644 --- a/test/fixtures/variables/default/output.css +++ b/test/fixtures/variables/default/output.css @@ -45,6 +45,49 @@ h1 { /* Set 1 unit of vertical rhythm on the top and bottom margins. */ margin: 0.75em 0; } +/* Grouping content + ========================================================================== */ +/** + * Add the correct display in IE 9-. + */ +figcaption, +figure { + display: block; } + +/** + * Add the correct margin in IE 8. + */ +figure { + margin: 1.5em 40px; } + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ +hr { + box-sizing: content-box; + /* 1 */ + height: 0; + /* 1 */ + overflow: visible; + /* 2 */ } + +/** + * Add the correct display in IE. + */ +main { + display: block; } + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ +pre { + font-family: monospace, monospace; + /* 1 */ + font-size: 1em; + /* 2 */ } + /* Links ========================================================================== */ /** @@ -101,7 +144,9 @@ code, kbd, samp { font-family: monospace, monospace; - font-size: 1em; } + /* 1 */ + font-size: 1em; + /* 2 */ } /** * Add the correct font style in Android <4.4. @@ -167,30 +212,6 @@ img { svg:not(:root) { overflow: hidden; } -/* Grouping content - ========================================================================== */ -/** - * Add the correct margin in IE 8. - */ -figure { - margin: 1.5em 40px; } - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ -hr { - box-sizing: content-box; - /* 1 */ - height: 0; - /* 1 */ - overflow: visible; - /* 2 */ } - -pre { - font-family: monospace, monospace; - font-size: 1em; } - /* Forms ========================================================================== */ /** @@ -384,11 +405,9 @@ textarea { /* Interactive ========================================================================== */ /* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. + * Add the correct display in Edge, IE, and Firefox. */ -details, -menu { +details { display: block; } /* @@ -397,6 +416,12 @@ menu { summary { display: list-item; } +/* + * Add the correct display in IE 9-. + */ +menu { + display: block; } + /* Scripting ========================================================================== */ /** diff --git a/test/fixtures/variables/font/output.css b/test/fixtures/variables/font/output.css index 9236aef..e03241e 100644 --- a/test/fixtures/variables/font/output.css +++ b/test/fixtures/variables/font/output.css @@ -72,6 +72,83 @@ h6 { line-height: 1.5rem; margin: 1.5rem 0; } +/* Grouping content + ========================================================================== */ +/** + * Set 1 unit of vertical rhythm on the top and bottom margin. + */ +blockquote { + margin: 1.5rem 40px; } + +dl, +ol, +ul { + margin: 1.5rem 0; } + +/** + * Turn off margins on nested lists. + */ +ol ol, +ol ul, +ul ol, +ul ul { + margin: 0; } + +dd { + margin: 0 0 0 40px; } + +ol, +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 { + margin: 1.5rem 40px; } + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ +hr { + box-sizing: content-box; + /* 1 */ + height: 0; + /* 1 */ + overflow: visible; + /* 2 */ } + +/** + * Add the correct display in IE. + */ +main { + display: block; } + +/** + * Set 1 unit of vertical rhythm on the top and bottom margin. + */ +p, +pre { + margin: 1.5rem 0; } + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ +pre { + font-family: monospace, monospace; + /* 1 */ + font-size: 1em; + /* 2 */ } + /* Links ========================================================================== */ /** @@ -128,7 +205,9 @@ code, kbd, samp { font-family: monospace, monospace; - font-size: 1em; } + /* 1 */ + font-size: 1em; + /* 2 */ } /** * Add the correct font style in Android <4.4. @@ -194,66 +273,6 @@ img { svg:not(:root) { overflow: hidden; } -/* Grouping content - ========================================================================== */ -/** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ -blockquote { - margin: 1.5rem 40px; } - -dl, -menu, -ol, -ul { - margin: 1.5rem 0; } - -/** - * Turn off margins on nested lists. - */ -ol ol, -ol ul, -ul ol, -ul ul { - margin: 0; } - -dd { - margin: 0 0 0 40px; } - -menu, -ol, -ul { - padding: 0 0 0 40px; } - -/** - * Add the correct margin in IE 8. - */ -figure { - margin: 1.5rem 40px; } - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ -hr { - box-sizing: content-box; - /* 1 */ - height: 0; - /* 1 */ - overflow: visible; - /* 2 */ } - -/** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ -p, -pre { - margin: 1.5rem 0; } - -pre { - font-family: monospace, monospace; - font-size: 1em; } - /* Forms ========================================================================== */ /** @@ -447,11 +466,9 @@ textarea { /* Interactive ========================================================================== */ /* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. + * Add the correct display in Edge, IE, and Firefox. */ -details, -menu { +details { display: block; } /* @@ -460,6 +477,27 @@ menu { summary { display: list-item; } +/* + * Add the correct display in IE 9-. + */ +menu { + display: block; + /* + * 1. Set 1 unit of vertical rhythm on the top and bottom margin. + * 2. Set consistent space for the list style image. + */ + margin: 1.5rem 0; + /* 1 */ + padding: 0 0 0 40px; + /* 2 */ + /** + * Turn off margins on nested lists. + */ } + menu menu, + ol menu, + ul menu { + margin: 0; } + /* Scripting ========================================================================== */ /** diff --git a/test/fixtures/variables/indent-amount/output.css b/test/fixtures/variables/indent-amount/output.css index ddca8b3..651ed7c 100644 --- a/test/fixtures/variables/indent-amount/output.css +++ b/test/fixtures/variables/indent-amount/output.css @@ -72,6 +72,83 @@ h6 { line-height: 2.23881em; margin: 2.23881em 0; } +/* Grouping content + ========================================================================== */ +/** + * Set 1 unit of vertical rhythm on the top and bottom margin. + */ +blockquote { + margin: 1.5em 3em; } + +dl, +ol, +ul { + margin: 1.5em 0; } + +/** + * Turn off margins on nested lists. + */ +ol ol, +ol ul, +ul ol, +ul ul { + margin: 0; } + +dd { + margin: 0 0 0 3em; } + +ol, +ul { + padding: 0 0 0 3em; } + +/** + * Add the correct display in IE 9-. + */ +figcaption, +figure { + display: block; } + +/** + * Add the correct margin in IE 8. + */ +figure { + margin: 1.5em 3em; } + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ +hr { + box-sizing: content-box; + /* 1 */ + height: 0; + /* 1 */ + overflow: visible; + /* 2 */ } + +/** + * Add the correct display in IE. + */ +main { + display: block; } + +/** + * Set 1 unit of vertical rhythm on the top and bottom margin. + */ +p, +pre { + margin: 1.5em 0; } + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ +pre { + font-family: monospace, monospace; + /* 1 */ + font-size: 1em; + /* 2 */ } + /* Links ========================================================================== */ /** @@ -128,7 +205,9 @@ code, kbd, samp { font-family: monospace, monospace; - font-size: 1em; } + /* 1 */ + font-size: 1em; + /* 2 */ } /** * Add the correct font style in Android <4.4. @@ -194,66 +273,6 @@ img { svg:not(:root) { overflow: hidden; } -/* Grouping content - ========================================================================== */ -/** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ -blockquote { - margin: 1.5em 3em; } - -dl, -menu, -ol, -ul { - margin: 1.5em 0; } - -/** - * Turn off margins on nested lists. - */ -ol ol, -ol ul, -ul ol, -ul ul { - margin: 0; } - -dd { - margin: 0 0 0 3em; } - -menu, -ol, -ul { - padding: 0 0 0 3em; } - -/** - * Add the correct margin in IE 8. - */ -figure { - margin: 1.5em 3em; } - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ -hr { - box-sizing: content-box; - /* 1 */ - height: 0; - /* 1 */ - overflow: visible; - /* 2 */ } - -/** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ -p, -pre { - margin: 1.5em 0; } - -pre { - font-family: monospace, monospace; - font-size: 1em; } - /* Forms ========================================================================== */ /** @@ -447,11 +466,9 @@ textarea { /* Interactive ========================================================================== */ /* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. + * Add the correct display in Edge, IE, and Firefox. */ -details, -menu { +details { display: block; } /* @@ -460,6 +477,27 @@ menu { summary { display: list-item; } +/* + * Add the correct display in IE 9-. + */ +menu { + display: block; + /* + * 1. Set 1 unit of vertical rhythm on the top and bottom margin. + * 2. Set consistent space for the list style image. + */ + margin: 1.5em 0; + /* 1 */ + padding: 0 0 0 3em; + /* 2 */ + /** + * Turn off margins on nested lists. + */ } + menu menu, + ol menu, + ul menu { + margin: 0; } + /* Scripting ========================================================================== */ /** |