From 3f8ec6344b07427584c307843de2d9685de24a44 Mon Sep 17 00:00:00 2001 From: Mark Topper Date: Wed, 30 Mar 2016 10:09:28 +0200 Subject: [PATCH 1/4] Update to normalize.css v4.0.0 #19575 --- scss/_normalize.scss | 351 +++++++++++++++++++++---------------------- 1 file changed, 175 insertions(+), 176 deletions(-) diff --git a/scss/_normalize.scss b/scss/_normalize.scss index 93dd452172..c95efe9766 100644 --- a/scss/_normalize.scss +++ b/scss/_normalize.scss @@ -1,9 +1,8 @@ -/*! normalize.css commit fe56763 | MIT License | github.com/necolas/normalize.css */ +/*! normalize.css v4.0.0 | MIT License | github.com/necolas/normalize.css */ // -// 1. Set default font family to sans-serif. -// 2. Prevent iOS and IE text size adjust after device orientation change, -// without disabling user zoom. +// 1. Change the default font family in all browsers (opinionated). +// 2. Prevent adjustments of font size after orientation changes in IE and iOS. // html { @@ -13,7 +12,7 @@ html { } // -// Remove default margin. +// Remove the margin in all browsers (opinionated). // body { @@ -24,43 +23,39 @@ body { // ========================================================================== // -// Correct `block` display not defined for any HTML5 element in IE 8/9. -// Correct `block` display not defined for `details` or `summary` in IE 10/11 -// and Firefox. -// Correct `block` display not defined for `main` in IE 11. +// 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, +details, // 1 figcaption, figure, footer, header, -main, +main, // 2 menu, nav, section, -summary { +summary { // 1 display: block; } // -// 1. Correct `inline-block` display not defined in IE 8/9. -// 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. +// Add the correct display in IE 9-. // audio, canvas, progress, video { - display: inline-block; // 1 - vertical-align: baseline; // 2 + display: inline-block; } // -// Prevent modern browsers from displaying `audio` without controls. -// Remove excess height in iOS 5 devices. +// Add the correct display in iOS 4-7. // audio:not([controls]) { @@ -69,12 +64,20 @@ audio:not([controls]) { } // -// Address `[hidden]` styling not present in IE 8/9/10. -// Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. +// Add the correct vertical alignment in Chrome, Firefox, and Opera. // -[hidden], -template { +progress { + vertical-align: baseline; +} + +// +// Add the correct display in IE 10-. +// 1. Add the correct display in IE. +// + +template, // 1 +[hidden] { display: none; } @@ -82,7 +85,7 @@ template { // ========================================================================== // -// Remove the gray background color from active links in IE 10. +// Remove the gray background on active links in IE 10. // a { @@ -90,41 +93,49 @@ a { } // -// Improve readability of focused elements when they are also in an -// active/hover state. +// Remove the outline on focused links when they are also active or hovered +// in all browsers (opinionated). // -a { - &:active { - outline: 0; - } - &:hover { - outline: 0; - } +a:active, +a:hover { + outline-width: 0; } // Text-level semantics // ========================================================================== // -// Address styling not present in IE 8/9/10/11, Safari, and Chrome. +// 1. Remove the bottom border in Firefox 39-. +// 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. // abbr[title] { - border-bottom: 1px dotted; + border-bottom: none; // 1 + text-decoration: underline; // 2 + text-decoration: underline dotted; // 2 } // -// Address style set to `bolder` in Firefox 4+, Safari, and Chrome. +// Prevent the duplicate application of `bolder` by the next rule in Safari 6. // b, strong { - font-weight: bold; + font-weight: inherit; } // -// Address styling not present in Safari and Chrome. +// Add the correct font weight in Chrome, Edge, and Safari. +// + +b, +strong { + font-weight: bolder; +} + +// +// Add the correct font style in Android 4.3-. // dfn { @@ -132,8 +143,8 @@ dfn { } // -// 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 { @@ -142,16 +153,16 @@ h1 { } // -// Address styling not present in IE 8/9. +// Add the correct background and color in IE 9-. // mark { - background: #ff0; + background-color: #ff0; color: #000; } // -// Address inconsistent and variable font size in all browsers. +// Add the correct font size in all browsers. // small { @@ -159,7 +170,8 @@ small { } // -// Prevent `sub` and `sup` affecting `line-height` in all browsers. +// Prevent `sub` and `sup` elements from affecting the line height in +// all browsers. // sub, @@ -170,27 +182,27 @@ sup { vertical-align: baseline; } -sup { - top: -0.5em; -} - sub { bottom: -0.25em; } +sup { + top: -0.5em; +} + // Embedded content // ========================================================================== // -// Remove border when inside `a` element in IE 8/9/10. +// Remove the border on images inside links in IE 10-. // img { - border: 0; + border-style: none; } // -// Correct overflow not hidden in IE 9/10/11. +// Hide the overflow in IE. // svg:not(:root) { @@ -201,7 +213,20 @@ svg:not(:root) { // ========================================================================== // -// Address margin not present in IE 8/9 and Safari. +// 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 { @@ -209,106 +234,106 @@ figure { } // -// Address differences between Firefox and other browsers. +// 1. Add the correct box sizing in Firefox. +// 2. Show the overflow in Edge and IE. // hr { - box-sizing: content-box; - height: 0; -} - -// -// Contain overflow in all browsers. -// - -pre { - overflow: auto; -} - -// -// Address odd `em`-unit font size rendering in all browsers. -// - -code, -kbd, -pre, -samp { - font-family: monospace, monospace; - font-size: 1em; + box-sizing: content-box; // 1 + height: 0; // 1 + overflow: visible; // 2 } // Forms // ========================================================================== // -// Known limitation: by default, Chrome and Safari on OS X allow very limited -// styling of `select`, unless a `border` property is set. -// - -// -// 1. Correct color not being inherited. -// Known issue: affects color of disabled elements. -// 2. Correct font properties not being inherited. -// 3. Address margins set differently in Firefox 4+, Safari, and Chrome. +// Change font properties to `inherit` in all browsers (opinionated). // button, input, -optgroup, select, textarea { - color: inherit; // 1 - font: inherit; // 2 - margin: 0; // 3 + font: inherit; } // -// Address `overflow` set to `hidden` in IE 8/9/10/11. +// Restore the font weight unset by the previous rule. // -button { +optgroup { + font-weight: bold; +} + +// +// Show the overflow in IE. +// 1. Show the overflow in Edge. +// 2. Show the overflow in Edge, Firefox, and IE. +// + +button, +input, // 1 +select { // 2 overflow: visible; } // -// Address inconsistent `text-transform` inheritance for `button` and `select`. -// All other form control elements do not inherit `text-transform` values. -// Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. -// Correct `select` style inheritance in Firefox. +// Remove the margin in Safari. +// 1. Remove the margin in Firefox and Safari. // button, -select { +input, +select, +textarea { // 1 + margin: 0; +} + +// +// Remove the inheritence of text transform in Edge, Firefox, and IE. +// 1. Remove the inheritence of text transform in Firefox. +// + +button, +select { // 1 text-transform: none; } // -// 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` -// and `video` controls. -// 2. Correct inability to style clickable `input` types in iOS. -// 3. Improve usability and consistency of cursor style between image-type -// `input` and others. +// Change the cursor in all browsers (opinionated). // button, -html input[type="button"], // 1 -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; // 2 - cursor: pointer; // 3 +[type="button"], +[type="reset"], +[type="submit"] { + cursor: pointer; } // -// Re-set default cursor for disabled elements. +// Restore the default cursor to disabled elements unset by the previous rule. // -button[disabled], -html input[disabled] { +[disabled] { cursor: default; } // -// Remove inner padding and border in Firefox 4+. +// 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. +// + +button, +html [type="button"], // 1 +[type="reset"], +[type="submit"] { + -webkit-appearance: button; // 2 +} + +// +// Remove the inner border and padding in Firefox. // button::-moz-focus-inner, @@ -318,60 +343,16 @@ input::-moz-focus-inner { } // -// Address Firefox 4+ setting `line-height` on `input` using `!important` in -// the UA stylesheet. +// Restore the focus styles unset by the previous rule. // -input { - line-height: normal; +button:-moz-focusring, +input:-moz-focusring { + outline: 1px dotted ButtonText; } // -// It's recommended that you don't attempt to style these elements. -// Firefox's implementation doesn't respect box-sizing, padding, or width. -// -// 1. Address box sizing set to `content-box` in IE 8/9/10. -// 2. Remove excess padding in IE 8/9/10. -// - -input[type="checkbox"], -input[type="radio"] { - box-sizing: border-box; // 1 - padding: 0; // 2 -} - -// -// Fix the cursor style for Chrome's increment/decrement buttons. For certain -// `font-size` values of the `input`, it causes the cursor style of the -// decrement button to change from `default` to `text`. -// - -input[type="number"]::-webkit-inner-spin-button, -input[type="number"]::-webkit-outer-spin-button { - height: auto; -} - -// -// Address `appearance` set to `searchfield` in Safari and Chrome. -// - -input[type="search"] { - -webkit-appearance: textfield; -} - -// -// Remove inner padding and search cancel button in Safari and Chrome on OS X. -// Safari (but not Chrome) clips the cancel button when the search input has -// padding (and `textfield` appearance). -// - -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -// -// Define consistent border, margin, and padding. +// Change the border, margin, and padding in all browsers (opinionated). // fieldset { @@ -381,17 +362,23 @@ fieldset { } // -// 1. Correct `color` not being inherited in IE 8/9/10/11. -// 2. Remove padding so people aren't caught out if they zero out fieldsets. +// 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 { - border: 0; // 1 - padding: 0; // 2 + box-sizing: border-box; // 1 + color: inherit; // 2 + display: table; // 1 + max-width: 100%; // 1 + padding: 0; // 3 + white-space: normal; // 1 } // -// Remove default vertical scrollbar in IE 8/9/10/11. +// Remove the default vertical scrollbar in IE. // textarea { @@ -399,27 +386,39 @@ textarea { } // -// Don't inherit the `font-weight` (applied by a rule above). -// NOTE: the default cannot safely be changed in Chrome and Safari on OS X. +// 1. Add the correct box sizing in IE 10-. +// 2. Remove the padding in IE 10-. // -optgroup { - font-weight: bold; +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; // 1 + padding: 0; // 2 } -// Tables -// ========================================================================== - // -// Remove most spacing between table cells. +// Correct the cursor style of increment and decrement buttons in Chrome. // -table { - border-collapse: collapse; - border-spacing: 0; +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; } -td, -th { - padding: 0; +// +// Correct the odd appearance of search inputs in Chrome and Safari. +// + +[type="search"] { + -webkit-appearance: textfield; +} + +// +// Remove the inner padding and cancel buttons in Chrome on OS X and +// Safari on OS X. +// + +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; } From 0e2438b512af0299d30fc17a32f67560c16fd647 Mon Sep 17 00:00:00 2001 From: Mark Topper Date: Wed, 30 Mar 2016 10:18:36 +0200 Subject: [PATCH 2/4] Append HoundCi fixes https://github.com/twbs/bootstrap/pull/19639#discussion-diff-57850395 https://github.com/twbs/bootstrap/pull/19639#discussion-diff-57850397 https://github.com/twbs/bootstrap/pull/19639#discussion-diff-57850398 https://github.com/twbs/bootstrap/pull/19639#discussion-diff-57850401 https://github.com/twbs/bootstrap/pull/19639#discussion-diff-57850399 https://github.com/twbs/bootstrap/pull/19639#discussion-diff-57850402 https://github.com/twbs/bootstrap/pull/19639#discussion-diff-57850403 --- scss/_normalize.scss | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/scss/_normalize.scss b/scss/_normalize.scss index c95efe9766..2b12384262 100644 --- a/scss/_normalize.scss +++ b/scss/_normalize.scss @@ -1,4 +1,4 @@ -/*! normalize.css v4.0.0 | MIT License | github.com/necolas/normalize.css */ +// normalize.css v4.0.0 | MIT License | github.com/necolas/normalize.css // // 1. Change the default font family in all browsers (opinionated). @@ -111,8 +111,7 @@ a:hover { // abbr[title] { - border-bottom: none; // 1 - text-decoration: underline; // 2 + border-bottom: 0; // 1 text-decoration: underline dotted; // 2 } @@ -157,8 +156,8 @@ h1 { // mark { - background-color: #ff0; color: #000; + background-color: #ff0; } // @@ -187,7 +186,7 @@ sub { } sup { - top: -0.5em; + top: -.5em; } // Embedded content @@ -338,8 +337,8 @@ html [type="button"], // 1 button::-moz-focus-inner, input::-moz-focus-inner { - border: 0; padding: 0; + border: 0; } // @@ -370,10 +369,10 @@ fieldset { legend { box-sizing: border-box; // 1 - color: inherit; // 2 display: table; // 1 max-width: 100%; // 1 padding: 0; // 3 + color: inherit; // 2 white-space: normal; // 1 } From 62fea119c6befe4239a6353a5b6c42de0dd6a037 Mon Sep 17 00:00:00 2001 From: Mark Topper Date: Thu, 31 Mar 2016 09:37:58 +0200 Subject: [PATCH 3/4] Reverted Reverted to original content from https://raw.githubusercontent.com/necolas/normalize.css/d311749e127ea3ea13eb900ad953270d62734f4f/normalize.css --- scss/_normalize.scss | 365 ++++++++++++++++++++++--------------------- 1 file changed, 183 insertions(+), 182 deletions(-) diff --git a/scss/_normalize.scss b/scss/_normalize.scss index 2b12384262..b0d3f972a8 100644 --- a/scss/_normalize.scss +++ b/scss/_normalize.scss @@ -1,51 +1,51 @@ -// normalize.css v4.0.0 | MIT License | github.com/necolas/normalize.css +/*! normalize.css v4.0.0 | MIT License | github.com/necolas/normalize.css */ -// -// 1. Change the default font family in all browsers (opinionated). -// 2. Prevent adjustments of font size after orientation changes in IE and iOS. -// +/** + * 1. Change the default font family in all browsers (opinionated). + * 2. Prevent adjustments of font size after orientation changes in IE and iOS. + */ html { - font-family: sans-serif; // 1 - -ms-text-size-adjust: 100%; // 2 - -webkit-text-size-adjust: 100%; // 2 + font-family: sans-serif; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ } -// -// Remove the margin in all browsers (opinionated). -// +/** + * Remove the margin in all browsers (opinionated). + */ body { margin: 0; } -// HTML5 display definitions -// ========================================================================== +/* 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. -// +/** + * 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 +details, /* 1 */ figcaption, figure, footer, header, -main, // 2 +main, /* 2 */ menu, nav, section, -summary { // 1 +summary { /* 1 */ display: block; } -// -// Add the correct display in IE 9-. -// +/** + * Add the correct display in IE 9-. + */ audio, canvas, @@ -54,124 +54,125 @@ video { display: inline-block; } -// -// Add the correct display in iOS 4-7. -// +/** + * 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. -// +/** + * 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. -// +/** + * Add the correct display in IE 10-. + * 1. Add the correct display in IE. + */ -template, // 1 +template, /* 1 */ [hidden] { display: none; } -// Links -// ========================================================================== +/* Links + ========================================================================== */ -// -// Remove the gray background on active links in IE 10. -// +/** + * Remove the gray background on active links in IE 10. + */ a { background-color: transparent; } -// -// Remove the outline on focused links when they are also active or hovered -// in all browsers (opinionated). -// +/** + * Remove the outline on focused links when they are also active or hovered + * in all browsers (opinionated). + */ a:active, a:hover { outline-width: 0; } -// Text-level semantics -// ========================================================================== +/* Text-level semantics + ========================================================================== */ -// -// 1. Remove the bottom border in Firefox 39-. -// 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. -// +/** + * 1. Remove the bottom border in Firefox 39-. + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ abbr[title] { - border-bottom: 0; // 1 - text-decoration: underline dotted; // 2 + 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. -// +/** + * Prevent the duplicate application of `bolder` by the next rule in Safari 6. + */ b, strong { font-weight: inherit; } -// -// Add the correct font weight in Chrome, Edge, and Safari. -// +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ b, strong { font-weight: bolder; } -// -// Add the correct font style in Android 4.3-. -// +/** + * Add the correct font style in Android 4.3-. + */ dfn { font-style: italic; } -// -// Correct the font size and margin on `h1` elements within `section` and -// `article` contexts in Chrome, Firefox, and Safari. -// +/** + * 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-. -// +/** + * Add the correct background and color in IE 9-. + */ mark { - color: #000; background-color: #ff0; + color: #000; } -// -// Add the correct font size in all browsers. -// +/** + * Add the correct font size in all browsers. + */ small { font-size: 80%; } -// -// Prevent `sub` and `sup` elements from affecting the line height in -// all browsers. -// +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ sub, sup { @@ -186,69 +187,69 @@ sub { } sup { - top: -.5em; + top: -0.5em; } -// Embedded content -// ========================================================================== +/* Embedded content + ========================================================================== */ -// -// Remove the border on images inside links in IE 10-. -// +/** + * Remove the border on images inside links in IE 10-. + */ img { border-style: none; } -// -// Hide the overflow in IE. -// +/** + * Hide the overflow in IE. + */ svg:not(:root) { overflow: hidden; } -// Grouping content -// ========================================================================== +/* Grouping content + ========================================================================== */ -// -// 1. Correct the inheritance and scaling of font size in all browsers. -// 2. Correct the odd `em` font sizing in all browsers. -// +/** + * 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 + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ } -// -// Add the correct margin in IE 8. -// +/** + * 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. -// +/** + * 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 + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ } -// Forms -// ========================================================================== +/* Forms + ========================================================================== */ -// -// Change font properties to `inherit` in all browsers (opinionated). -// +/** + * Change font properties to `inherit` in all browsers (opinionated). + */ button, input, @@ -257,51 +258,51 @@ textarea { font: inherit; } -// -// Restore the font weight unset by the previous rule. -// +/** + * Restore the font weight unset by the previous rule. + */ optgroup { font-weight: bold; } -// -// Show the overflow in IE. -// 1. Show the overflow in Edge. -// 2. Show the overflow in Edge, Firefox, and IE. -// +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + * 2. Show the overflow in Edge, Firefox, and IE. + */ button, -input, // 1 -select { // 2 +input, /* 1 */ +select { /* 2 */ overflow: visible; } -// -// Remove the margin in Safari. -// 1. Remove the margin in Firefox and Safari. -// +/** + * Remove the margin in Safari. + * 1. Remove the margin in Firefox and Safari. + */ button, input, select, -textarea { // 1 +textarea { /* 1 */ margin: 0; } -// -// Remove the inheritence of text transform in Edge, Firefox, and IE. -// 1. Remove the inheritence of text transform in Firefox. -// +/** + * Remove the inheritence of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritence of text transform in Firefox. + */ button, -select { // 1 +select { /* 1 */ text-transform: none; } -// -// Change the cursor in all browsers (opinionated). -// +/** + * Change the cursor in all browsers (opinionated). + */ button, [type="button"], @@ -310,49 +311,49 @@ button, cursor: pointer; } -// -// Restore the default cursor to disabled elements unset by the previous rule. -// +/** + * Restore the default cursor to disabled elements unset by the previous rule. + */ [disabled] { cursor: default; } -// -// 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. -// +/** + * 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. + */ button, -html [type="button"], // 1 +html [type="button"], /* 1 */ [type="reset"], [type="submit"] { - -webkit-appearance: button; // 2 + -webkit-appearance: button; /* 2 */ } -// -// Remove the inner border and padding in Firefox. -// +/** + * Remove the inner border and padding in Firefox. + */ button::-moz-focus-inner, input::-moz-focus-inner { - padding: 0; border: 0; + padding: 0; } -// -// Restore the focus styles unset by the previous rule. -// +/** + * Restore the focus styles unset by the previous rule. + */ button:-moz-focusring, input:-moz-focusring { outline: 1px dotted ButtonText; } -// -// Change the border, margin, and padding in all browsers (opinionated). -// +/** + * Change the border, margin, and padding in all browsers (opinionated). + */ fieldset { border: 1px solid #c0c0c0; @@ -360,62 +361,62 @@ fieldset { padding: 0.35em 0.625em 0.75em; } -// -// 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. -// +/** + * 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; // 1 - display: table; // 1 - max-width: 100%; // 1 - padding: 0; // 3 - color: inherit; // 2 - white-space: normal; // 1 + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ } -// -// Remove the default vertical scrollbar in IE. -// +/** + * Remove the default vertical scrollbar in IE. + */ textarea { overflow: auto; } -// -// 1. Add the correct box sizing in IE 10-. -// 2. Remove the padding in IE 10-. -// +/** + * 1. Add the correct box sizing in IE 10-. + * 2. Remove the padding in IE 10-. + */ [type="checkbox"], [type="radio"] { - box-sizing: border-box; // 1 - padding: 0; // 2 + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ } -// -// Correct the cursor style of increment and decrement buttons in Chrome. -// +/** + * 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; } -// -// Correct the odd appearance of search inputs in Chrome and Safari. -// +/** + * Correct the odd appearance of search inputs in Chrome and Safari. + */ [type="search"] { -webkit-appearance: textfield; } -// -// Remove the inner padding and cancel buttons in Chrome on OS X and -// Safari on OS X. -// +/** + * Remove the inner padding and cancel buttons in Chrome on OS X and + * Safari on OS X. + */ [type="search"]::-webkit-search-cancel-button, [type="search"]::-webkit-search-decoration { From 717f80f5d4253b7ad7b4868d1afa2059ed627005 Mon Sep 17 00:00:00 2001 From: Mark Topper Date: Thu, 31 Mar 2016 11:55:43 +0200 Subject: [PATCH 4/4] Fix comment style Fix comment style to `//`, because other than the initial attribution comment, [we don't want any comments in the compiled CSS](http://sass-lang.com/documentation/file.SASS_REFERENCE.html#comments). --- scss/_normalize.scss | 358 +++++++++++++++++++++---------------------- 1 file changed, 179 insertions(+), 179 deletions(-) diff --git a/scss/_normalize.scss b/scss/_normalize.scss index b0d3f972a8..8a74836b09 100644 --- a/scss/_normalize.scss +++ b/scss/_normalize.scss @@ -1,51 +1,51 @@ /*! normalize.css v4.0.0 | MIT License | github.com/necolas/normalize.css */ -/** - * 1. Change the default font family in all browsers (opinionated). - * 2. Prevent adjustments of font size after orientation changes in IE and iOS. - */ +// +// 1. Change the default font family in all browsers (opinionated). +// 2. Prevent adjustments of font size after orientation changes in IE and iOS. +// html { - font-family: sans-serif; /* 1 */ - -ms-text-size-adjust: 100%; /* 2 */ - -webkit-text-size-adjust: 100%; /* 2 */ + font-family: sans-serif; // 1 + -ms-text-size-adjust: 100%; // 2 + -webkit-text-size-adjust: 100%; // 2 } -/** - * Remove the margin in all browsers (opinionated). - */ +// +// Remove the margin in all browsers (opinionated). +// body { margin: 0; } -/* HTML5 display definitions - ========================================================================== */ +// 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. - */ +// +// 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 */ +details, // 1 figcaption, figure, footer, header, -main, /* 2 */ +main, // 2 menu, nav, section, -summary { /* 1 */ +summary { // 1 display: block; } -/** - * Add the correct display in IE 9-. - */ +// +// Add the correct display in IE 9-. +// audio, canvas, @@ -54,125 +54,125 @@ video { display: inline-block; } -/** - * Add the correct display in iOS 4-7. - */ +// +// 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. - */ +// +// 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. - */ +// +// Add the correct display in IE 10-. +// 1. Add the correct display in IE. +// -template, /* 1 */ +template, // 2 [hidden] { display: none; } -/* Links - ========================================================================== */ +// Links +// ========================================================================== -/** - * Remove the gray background on active links in IE 10. - */ +// +// Remove the gray background on active links in IE 10. +// a { background-color: transparent; } -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ +// +// Remove the outline on focused links when they are also active or hovered +// in all browsers (opinionated). +// a:active, a:hover { outline-width: 0; } -/* Text-level semantics - ========================================================================== */ +// Text-level semantics +// ========================================================================== -/** - * 1. Remove the bottom border in Firefox 39-. - * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. - */ +// +// 1. Remove the bottom border in Firefox 39-. +// 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. +// abbr[title] { - border-bottom: none; /* 1 */ - text-decoration: underline; /* 2 */ - text-decoration: underline dotted; /* 2 */ + 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. - */ +// +// Prevent the duplicate application of `bolder` by the next rule in Safari 6. +// b, strong { font-weight: inherit; } -/** - * Add the correct font weight in Chrome, Edge, and Safari. - */ +// +// Add the correct font weight in Chrome, Edge, and Safari. +// b, strong { font-weight: bolder; } -/** - * Add the correct font style in Android 4.3-. - */ +// +// Add the correct font style in Android 4.3-. +// dfn { font-style: italic; } -/** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ +// +// 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-. - */ +// +// Add the correct background and color in IE 9-. +// mark { background-color: #ff0; color: #000; } -/** - * Add the correct font size in all browsers. - */ +// +// Add the correct font size in all browsers. +// small { font-size: 80%; } -/** - * Prevent `sub` and `sup` elements from affecting the line height in - * all browsers. - */ +// +// Prevent `sub` and `sup` elements from affecting the line height in +// all browsers. +// sub, sup { @@ -190,66 +190,66 @@ sup { top: -0.5em; } -/* Embedded content - ========================================================================== */ +// Embedded content +// ========================================================================== -/** - * Remove the border on images inside links in IE 10-. - */ +// +// Remove the border on images inside links in IE 10-. +// img { border-style: none; } -/** - * Hide the overflow in IE. - */ +// +// Hide the overflow in IE. +// svg:not(:root) { overflow: hidden; } -/* Grouping content - ========================================================================== */ +// Grouping content +// ========================================================================== -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ +// +// 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 */ + font-family: monospace, monospace; // 1 + font-size: 1em; // 2 } -/** - * Add the correct margin in IE 8. - */ +// +// 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. - */ +// +// 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 */ + box-sizing: content-box; // 1 + height: 0; // 1 + overflow: visible; // 2 } -/* Forms - ========================================================================== */ +// Forms +// ========================================================================== -/** - * Change font properties to `inherit` in all browsers (opinionated). - */ +// +// Change font properties to `inherit` in all browsers (opinionated). +// button, input, @@ -258,51 +258,51 @@ textarea { font: inherit; } -/** - * Restore the font weight unset by the previous rule. - */ +// +// Restore the font weight unset by the previous rule. +// optgroup { font-weight: bold; } -/** - * Show the overflow in IE. - * 1. Show the overflow in Edge. - * 2. Show the overflow in Edge, Firefox, and IE. - */ +// +// Show the overflow in IE. +// 1. Show the overflow in Edge. +// 2. Show the overflow in Edge, Firefox, and IE. +// button, -input, /* 1 */ -select { /* 2 */ +input, // 1 +select { // 2 overflow: visible; } -/** - * Remove the margin in Safari. - * 1. Remove the margin in Firefox and Safari. - */ +// +// Remove the margin in Safari. +// 1. Remove the margin in Firefox and Safari. +// button, input, select, -textarea { /* 1 */ +textarea { // 1 margin: 0; } -/** - * Remove the inheritence of text transform in Edge, Firefox, and IE. - * 1. Remove the inheritence of text transform in Firefox. - */ +// +// Remove the inheritence of text transform in Edge, Firefox, and IE. +// 1. Remove the inheritence of text transform in Firefox. +// button, -select { /* 1 */ +select { // 1 text-transform: none; } -/** - * Change the cursor in all browsers (opinionated). - */ +// +// Change the cursor in all browsers (opinionated). +// button, [type="button"], @@ -311,30 +311,30 @@ button, cursor: pointer; } -/** - * Restore the default cursor to disabled elements unset by the previous rule. - */ +// +// Restore the default cursor to disabled elements unset by the previous rule. +// [disabled] { cursor: default; } -/** - * 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. - */ +// +// 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. +// button, -html [type="button"], /* 1 */ +html [type="button"], // 1 [type="reset"], [type="submit"] { - -webkit-appearance: button; /* 2 */ + -webkit-appearance: button; // 2 } -/** - * Remove the inner border and padding in Firefox. - */ +// +// Remove the inner border and padding in Firefox. +// button::-moz-focus-inner, input::-moz-focus-inner { @@ -342,18 +342,18 @@ input::-moz-focus-inner { padding: 0; } -/** - * Restore the focus styles unset by the previous rule. - */ +// +// Restore the focus styles unset by the previous rule. +// button:-moz-focusring, input:-moz-focusring { outline: 1px dotted ButtonText; } -/** - * Change the border, margin, and padding in all browsers (opinionated). - */ +// +// Change the border, margin, and padding in all browsers (opinionated). +// fieldset { border: 1px solid #c0c0c0; @@ -361,62 +361,62 @@ fieldset { padding: 0.35em 0.625em 0.75em; } -/** - * 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. - */ +// +// 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; /* 1 */ - color: inherit; /* 2 */ - display: table; /* 1 */ - max-width: 100%; /* 1 */ - padding: 0; /* 3 */ - white-space: normal; /* 1 */ + box-sizing: border-box; // 1 + color: inherit; // 2 + display: table; // 1 + max-width: 100%; // 1 + padding: 0; // 3 + white-space: normal; // 1 } -/** - * Remove the default vertical scrollbar in IE. - */ +// +// Remove the default vertical scrollbar in IE. +// textarea { overflow: auto; } -/** - * 1. Add the correct box sizing in IE 10-. - * 2. Remove the padding in IE 10-. - */ +// +// 1. Add the correct box sizing in IE 10-. +// 2. Remove the padding in IE 10-. +// [type="checkbox"], [type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ + box-sizing: border-box; // 1 + padding: 0; // 2 } -/** - * Correct the cursor style of increment and decrement buttons in Chrome. - */ +// +// 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; } -/** - * Correct the odd appearance of search inputs in Chrome and Safari. - */ +// +// Correct the odd appearance of search inputs in Chrome and Safari. +// [type="search"] { -webkit-appearance: textfield; } -/** - * Remove the inner padding and cancel buttons in Chrome on OS X and - * Safari on OS X. - */ +// +// Remove the inner padding and cancel buttons in Chrome on OS X and +// Safari on OS X. +// [type="search"]::-webkit-search-cancel-button, [type="search"]::-webkit-search-decoration {