0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00

Upgrade to normalize.css v4.2.0 and fix Hound exclusion.

This commit is contained in:
Bardi Harborow 2016-08-02 15:17:24 +10:00 committed by Bardi Harborow
parent dad1c88653
commit f72c21bfc8
3 changed files with 54 additions and 54 deletions

View File

@ -3,7 +3,6 @@ fail_on_violations: true
scss: scss:
config_file: scss/.scss-lint.yml config_file: scss/.scss-lint.yml
enabled: true enabled: true
ignore_file: scss/_normalize.scss
javascript: javascript:
enabled: false enabled: false

View File

@ -3,6 +3,9 @@ scss_files:
- "**/*.scss" - "**/*.scss"
- "docs/assets/scss/**/*.scss" - "docs/assets/scss/**/*.scss"
exclude:
- "scss/_normalize.scss"
plugin_directories: ['.scss-linters'] plugin_directories: ['.scss-linters']
# List of gem names to load custom linters from (make sure they are already # List of gem names to load custom linters from (make sure they are already

View File

@ -1,14 +1,16 @@
/*! normalize.css v4.0.0 | MIT License | github.com/necolas/normalize.css */ /*! normalize.css v4.2.0 | MIT License | github.com/necolas/normalize.css */
// //
// 1. Change the default font family in all browsers (opinionated). // 1. Change the default font family in all browsers (opinionated).
// 2. Prevent adjustments of font size after orientation changes in IE and iOS. // 2. Correct the line height in all browsers.
// 3. Prevent adjustments of font size after orientation changes in IE and iOS.
// //
html { html {
font-family: sans-serif; // 1 font-family: sans-serif; // 1
-ms-text-size-adjust: 100%; // 2 line-height: 1.15; // 2
-webkit-text-size-adjust: 100%; // 2 -ms-text-size-adjust: 100%; // 3
-webkit-text-size-adjust: 100%; // 3
} }
// //
@ -76,7 +78,7 @@ progress {
// 1. Add the correct display in IE. // 1. Add the correct display in IE.
// //
template, // 2 template, // 1
[hidden] { [hidden] {
display: none; display: none;
} }
@ -85,11 +87,13 @@ template, // 2
// ========================================================================== // ==========================================================================
// //
// Remove the gray background on active links in IE 10. // 1. Remove the gray background on active links in IE 10.
// 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
// //
a { a {
background-color: transparent; background-color: transparent; // 1
-webkit-text-decoration-skip: objects; // 2
} }
// //
@ -248,14 +252,17 @@ hr {
// ========================================================================== // ==========================================================================
// //
// Change font properties to `inherit` in all browsers (opinionated). // 1. Change font properties to `inherit` in all browsers (opinionated).
// 2. Remove the margin in Firefox and Safari.
// //
button, button,
input, input,
optgroup,
select, select,
textarea { textarea {
font: inherit; font: inherit; // 1
margin: 0; // 2
} }
// //
@ -269,30 +276,16 @@ optgroup {
// //
// Show the overflow in IE. // Show the overflow in IE.
// 1. Show the overflow in Edge. // 1. Show the overflow in Edge.
// 2. Show the overflow in Edge, Firefox, and IE.
// //
button, button,
input, // 1 input { // 1
select { // 2
overflow: visible; overflow: visible;
} }
// //
// Remove the margin in Safari. // Remove the inheritance of text transform in Edge, Firefox, and IE.
// 1. Remove the margin in Firefox and Safari. // 1. Remove the inheritance of text transform in Firefox.
//
button,
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, button,
@ -300,29 +293,10 @@ select { // 1
text-transform: none; text-transform: none;
} }
//
// Change the cursor in all browsers (opinionated).
//
button,
[type="button"],
[type="reset"],
[type="submit"] {
cursor: pointer;
}
//
// 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` // 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
// controls in Android 4. // controls in Android 4.
// 2. Correct the inability to style clickable types in iOS. // 2. Correct the inability to style clickable types in iOS and Safari.
// //
button, button,
@ -337,8 +311,10 @@ html [type="button"], // 1
// //
button::-moz-focus-inner, button::-moz-focus-inner,
input::-moz-focus-inner { [type="button"]::-moz-focus-inner,
border: 0; [type="reset"]::-moz-focus-inner,
[type="submit"]::-moz-focus-inner {
border-style: none;
padding: 0; padding: 0;
} }
@ -347,7 +323,9 @@ input::-moz-focus-inner {
// //
button:-moz-focusring, button:-moz-focusring,
input:-moz-focusring { [type="button"]:-moz-focusring,
[type="reset"]:-moz-focusring,
[type="submit"]:-moz-focusring {
outline: 1px dotted ButtonText; outline: 1px dotted ButtonText;
} }
@ -406,19 +384,39 @@ textarea {
} }
// //
// Correct the odd appearance of search inputs in Chrome and Safari. // 1. Correct the odd appearance in Chrome and Safari.
// 2. Correct the outline style in Safari.
// //
[type="search"] { [type="search"] {
-webkit-appearance: textfield; -webkit-appearance: textfield; // 1
outline-offset: -2px; // 2
} }
// //
// Remove the inner padding and cancel buttons in Chrome on OS X and // Remove the inner padding and cancel buttons in Chrome and Safari on OS X.
// Safari on OS X.
// //
[type="search"]::-webkit-search-cancel-button, [type="search"]::-webkit-search-cancel-button,
[type="search"]::-webkit-search-decoration { [type="search"]::-webkit-search-decoration {
-webkit-appearance: none; -webkit-appearance: none;
} }
//
// Correct the text style of placeholders in Chrome, Edge, and Safari.
//
::-webkit-input-placeholder {
color: inherit;
opacity: 0.54;
}
//
// 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; // 1
font: inherit; // 2
}