From c0a4f207e35d197798cd854b2f8c43f4432ead1a Mon Sep 17 00:00:00 2001 From: Tomas M Date: Sat, 1 Jul 2017 17:28:54 -0500 Subject: [PATCH 1/4] Update Normalize.css to v7.0.0 I condensed similar styles as it was in previous _s version, but if needed I have normal version too. Personally, I prefer the normal version, as it makes much easier to compare with the original Normalize.css source. --- style.css | 182 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 93 insertions(+), 89 deletions(-) diff --git a/style.css b/style.css index c8362c0c49..f432b3090b 100644 --- a/style.css +++ b/style.css @@ -47,9 +47,8 @@ Nicolas Gallagher and Jonathan Neal http://necolas.github.io/normalize.css/ # Normalize --------------------------------------------------------------*/ html { - font-family: sans-serif; - -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; } body { @@ -66,58 +65,60 @@ header, main, menu, nav, -section, -summary { +section { display: block; } -audio, -canvas, -progress, -video { - display: inline-block; - vertical-align: baseline; +figure { + margin: 1em 40px; } -audio:not([controls]) { - display: none; +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +hr { + box-sizing: content-box; height: 0; + overflow: visible; } -[hidden], -template { - display: none; +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; } a { background-color: transparent; + -webkit-text-decoration-skip: objects; } -a:active, -a:hover { - outline: 0; +abbr[title] { + border-bottom: none; + text-decoration: underline; + text-decoration: underline dotted; } -abbr[title] { - border-bottom: 1px dotted; +b, +strong { + font-weight: inherit; } b, strong { - font-weight: bold; + font-weight: bolder; } dfn { font-style: italic; } -h1 { - font-size: 2em; - margin: 0.67em 0; -} - mark { - background: #ff0; + background-color: #ff0; color: #000; } @@ -133,41 +134,36 @@ sup { vertical-align: baseline; } -sup { - top: -0.5em; -} - sub { bottom: -0.25em; } -img { - border: 0; +sup { + top: -0.5em; } -svg:not(:root) { - overflow: hidden; +audio, +canvas, +progress, +video { + display: inline-block; } -figure { - margin: 1em 40px; +audio:not([controls]) { + display: none; + height: 0; } -hr { - box-sizing: content-box; - height: 0; +progress { + vertical-align: baseline; } -pre { - overflow: auto; +img { + border-style: none; } -code, -kbd, -pre, -samp { - font-family: monospace, monospace; - font-size: 1em; +svg:not(:root) { + overflow: hidden; } button, @@ -175,12 +171,14 @@ input, optgroup, select, textarea { - color: inherit; - font: inherit; + font-family: sans-serif; + font-size: 100%; + line-height: 1.15; margin: 0; } -button { +button, +input { overflow: visible; } @@ -190,71 +188,77 @@ select { } button, -html input[type="button"], -input[type="reset"], -input[type="submit"] { +html [type="button"], +[type="reset"], +[type="submit"] { -webkit-appearance: button; - cursor: pointer; -} - -button[disabled], -html input[disabled] { - cursor: default; } button::-moz-focus-inner, -input::-moz-focus-inner { - border: 0; +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; padding: 0; } -input { - line-height: normal; +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; } -input[type="checkbox"], -input[type="radio"] { +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +legend { box-sizing: border-box; + color: inherit; + display: table; + max-width: 100%; padding: 0; + white-space: normal; } -input[type="number"]::-webkit-inner-spin-button, -input[type="number"]::-webkit-outer-spin-button { - height: auto; +textarea { + overflow: auto; } -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; + padding: 0; } -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; } -legend { - border: 0; - padding: 0; +[type="search"] { + -webkit-appearance: textfield; + outline-offset: -2px; } -textarea { - overflow: auto; +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; } -optgroup { - font-weight: bold; +::-webkit-file-upload-button { + -webkit-appearance: button; + font: inherit; } -table { - border-collapse: collapse; - border-spacing: 0; +summary { + display: list-item; } -td, -th { - padding: 0; +[hidden], +template { + display: none; } /*-------------------------------------------------------------- From d81bccdb5f75322041b391f2744dd622d1a93ccd Mon Sep 17 00:00:00 2001 From: Tomas M Date: Sat, 8 Jul 2017 13:37:18 -0500 Subject: [PATCH 2/4] Update style.css --- style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.css b/style.css index f432b3090b..00487f6a36 100644 --- a/style.css +++ b/style.css @@ -44,7 +44,7 @@ Nicolas Gallagher and Jonathan Neal http://necolas.github.io/normalize.css/ --------------------------------------------------------------*/ /*-------------------------------------------------------------- -# Normalize +# Normalize v7.0.0 --------------------------------------------------------------*/ html { -ms-text-size-adjust: 100%; From 4a9f60347cdeca9a5d9637302b4d8e656187aa49 Mon Sep 17 00:00:00 2001 From: Tomas M Date: Tue, 18 Jul 2017 17:59:10 -0500 Subject: [PATCH 3/4] Updated styles to original form with full comments --- style.css | 396 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 314 insertions(+), 82 deletions(-) diff --git a/style.css b/style.css index 00487f6a36..5238d9b0c3 100644 --- a/style.css +++ b/style.css @@ -46,219 +46,451 @@ Nicolas Gallagher and Jonathan Neal http://necolas.github.io/normalize.css/ /*-------------------------------------------------------------- # Normalize v7.0.0 --------------------------------------------------------------*/ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in + * IE on Windows Phone and in iOS. + */ + html { - -ms-text-size-adjust: 100%; - -webkit-text-size-adjust: 100%; + line-height: 1.15; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ } +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers (opinionated). + */ + body { - margin: 0; + margin: 0; } +/** + * Add the correct display in IE 9-. + */ + article, aside, -details, -figcaption, -figure, footer, header, -main, -menu, nav, section { - display: block; + display: block; } -figure { - margin: 1em 40px; -} +/** + * 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; + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + * 1. Add the correct display in IE. + */ + +figcaption, +figure, +main { /* 1 */ + display: block; } +/** + * 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; - height: 0; - overflow: visible; + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ } -code, -kbd, -pre, -samp { - font-family: monospace, monospace; - font-size: 1em; +/** + * 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 + ========================================================================== */ + +/** + * 1. Remove the gray background on active links in IE 10. + * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. + */ + a { - background-color: transparent; - -webkit-text-decoration-skip: objects; + background-color: transparent; /* 1 */ + -webkit-text-decoration-skip: objects; /* 2 */ } +/** + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + abbr[title] { - border-bottom: none; - text-decoration: underline; - text-decoration: underline dotted; + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ } +/** + * Prevent the duplicate application of `bolder` by the next rule in Safari 6. + */ + b, strong { - font-weight: inherit; + font-weight: inherit; } +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + b, strong { - font-weight: bolder; + 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-. + */ + dfn { - font-style: italic; + font-style: italic; } +/** + * Add the correct background and color in IE 9-. + */ + mark { - background-color: #ff0; - color: #000; + background-color: #ff0; + color: #000; } +/** + * Add the correct font size in all browsers. + */ + small { - font-size: 80%; + font-size: 80%; } +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + sub, sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; } sub { - bottom: -0.25em; + bottom: -0.25em; } sup { - top: -0.5em; + top: -0.5em; } +/* Embedded content + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + audio, -canvas, -progress, video { - display: inline-block; + display: inline-block; } +/** + * Add the correct display in iOS 4-7. + */ + audio:not([controls]) { - display: none; - height: 0; + display: none; + height: 0; } -progress { - vertical-align: baseline; -} +/** + * Remove the border on images inside links in IE 10-. + */ img { - border-style: none; + border-style: none; } +/** + * Hide the overflow in IE. + */ + svg:not(:root) { - overflow: hidden; + overflow: hidden; } +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers (opinionated). + * 2. Remove the margin in Firefox and Safari. + */ + button, input, optgroup, select, textarea { - font-family: sans-serif; - font-size: 100%; - line-height: 1.15; - margin: 0; + font-family: sans-serif; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ } +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + button, -input { - overflow: visible; +input { /* 1 */ + overflow: visible; } +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + button, -select { - text-transform: none; +select { /* 1 */ + text-transform: none; } +/** + * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` + * controls in Android 4. + * 2. Correct the inability to style clickable types in iOS and Safari. + */ + button, -html [type="button"], +html [type="button"], /* 1 */ [type="reset"], [type="submit"] { - -webkit-appearance: button; + -webkit-appearance: button; /* 2 */ } +/** + * Remove the inner border and padding in Firefox. + */ + button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner { - border-style: none; - padding: 0; + border-style: none; + padding: 0; } +/** + * Restore the focus styles unset by the previous rule. + */ + button:-moz-focusring, [type="button"]:-moz-focusring, [type="reset"]:-moz-focusring, [type="submit"]:-moz-focusring { - outline: 1px dotted ButtonText; + outline: 1px dotted ButtonText; } +/** + * Correct the padding in Firefox. + */ + fieldset { - padding: 0.35em 0.75em 0.625em; + padding: 0.35em 0.75em 0.625em; } +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + legend { - box-sizing: border-box; - color: inherit; - display: table; - max-width: 100%; - padding: 0; - white-space: normal; + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + 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. + */ + textarea { - overflow: auto; + overflow: auto; } +/** + * 1. Add the correct box sizing in IE 10-. + * 2. Remove the padding in IE 10-. + */ + [type="checkbox"], [type="radio"] { - box-sizing: border-box; - padding: 0; + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ } +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + [type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button { - height: auto; + height: auto; } +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + [type="search"] { - -webkit-appearance: textfield; - outline-offset: -2px; + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ } +/** + * Remove the inner padding and cancel buttons in Chrome and Safari on macOS. + */ + [type="search"]::-webkit-search-cancel-button, [type="search"]::-webkit-search-decoration { - -webkit-appearance: none; + -webkit-appearance: none; } +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + ::-webkit-file-upload-button { - -webkit-appearance: button; - font: inherit; + -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 { + display: block; } +/* + * Add the correct display in all browsers. + */ + summary { - display: list-item; + display: list-item; +} + +/* Scripting + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + +canvas { + display: inline-block; } -[hidden], +/** + * Add the correct display in IE. + */ + template { - display: none; + display: none; +} + +/* Hidden + ========================================================================== */ + +/** + * Add the correct display in IE 10-. + */ + +[hidden] { + display: none; } /*-------------------------------------------------------------- From 8907f712e2677ce248a94e0c85ed9d5a8675c625 Mon Sep 17 00:00:00 2001 From: Tomas M Date: Tue, 18 Jul 2017 18:07:57 -0500 Subject: [PATCH 4/4] Including original preable To make it same as in _normalize.scss. This way there will be no need to update style.scss Normalize.css comment each time new version comes. --- style.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/style.css b/style.css index 5238d9b0c3..d7d2b0f629 100644 --- a/style.css +++ b/style.css @@ -44,9 +44,11 @@ Nicolas Gallagher and Jonathan Neal http://necolas.github.io/normalize.css/ --------------------------------------------------------------*/ /*-------------------------------------------------------------- -# Normalize v7.0.0 +# Normalize --------------------------------------------------------------*/ +/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */ + /* Document ========================================================================== */