From bbcf62d86f5e327673283900221c8ababa836671 Mon Sep 17 00:00:00 2001 From: Jonathan Neal Date: Wed, 6 Jul 2016 11:23:05 -0400 Subject: [PATCH 1/2] Use HTML Living Standard sectioning --- normalize.css | 230 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 138 insertions(+), 92 deletions(-) diff --git a/normalize.css b/normalize.css index 8fd6326..12c6061 100644 --- a/normalize.css +++ b/normalize.css @@ -6,6 +6,9 @@ * 3. Prevent adjustments of font size after orientation changes in IE and iOS. */ +/* Document + ========================================================================== */ + html { font-family: sans-serif; /* 1 */ line-height: 1.15; /* 2 */ @@ -13,6 +16,9 @@ html { -webkit-text-size-adjust: 100%; /* 3 */ } +/* Sections + ========================================================================== */ + /** * Remove the margin in all browsers (opinionated). */ @@ -21,69 +27,73 @@ body { margin: 0; } -/* HTML5 display definitions - ========================================================================== */ - /** * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. - * 2. Add the correct display in IE. */ article, aside, -details, /* 1 */ -figcaption, -figure, footer, header, -main, /* 2 */ -menu, nav, -section, -summary { /* 1 */ +section { display: block; } +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + /** * Add the correct display in IE 9-. - */ - -audio, -canvas, -progress, -video { - display: inline-block; -} - -/** - * Add the correct display 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 10-. * 1. Add the correct display in IE. */ -template, /* 1 */ -[hidden] { - display: none; +figcaption, +figure, +main { /* 1 */ + display: block; } -/* Links +/** + * Add the correct margin in IE 8. + */ + +figure { + margin: 1em 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 */ +} + +/** + * 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 */ +} + +/* Text-level semantics ========================================================================== */ /** @@ -106,9 +116,6 @@ a:hover { outline-width: 0; } -/* Text-level semantics - ========================================================================== */ - /** * 1. Remove the bottom border in Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. @@ -138,6 +145,18 @@ 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. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + /** * Add the correct font style in Android 4.3-. */ @@ -146,16 +165,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; - margin: 0.67em 0; -} - /** * Add the correct background and color in IE 9-. */ @@ -197,6 +206,24 @@ 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 10-. */ @@ -213,41 +240,6 @@ svg:not(:root) { overflow: hidden; } -/* Grouping content - ========================================================================== */ - -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -code, -kbd, -pre, -samp { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ -} - -/** - * Add the correct margin in IE 8. - */ - -figure { - margin: 1em 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 */ -} - /* Forms ========================================================================== */ @@ -355,6 +347,16 @@ legend { white-space: normal; /* 1 */ } +/** + * 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. */ @@ -411,3 +413,47 @@ textarea { -webkit-appearance: button; /* 1 */ font: inherit; /* 2 */ } + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ + +details, /* 1 */ +menu, +summary { /* 1 */ + display: block; +} + +/* 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; +} From 55ed05a79c0fd7a9a2c330c6925b982a7d5b307c Mon Sep 17 00:00:00 2001 From: Jonathan Neal Date: Wed, 6 Jul 2016 11:40:39 -0400 Subject: [PATCH 2/2] Correct the display of in all browsers --- normalize.css | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/normalize.css b/normalize.css index 12c6061..9f9a577 100644 --- a/normalize.css +++ b/normalize.css @@ -423,11 +423,18 @@ textarea { */ details, /* 1 */ -menu, -summary { /* 1 */ +menu { display: block; } +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + /* Scripting ========================================================================== */