diff options
| author | Mark Otto <[email protected]> | 2013-10-20 22:55:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-20 22:55:45 -0700 |
| commit | 2eec3f919e7bd7ee847c2631ae9c53515cac1c8f (patch) | |
| tree | b9dd9c6b61fcb72aafe47dd85beac8cfb9da4fe2 /less/normalize.less | |
| parent | ab3d0a27b3d93eebff3852728f94ddc4fcb35199 (diff) | |
| parent | 6585c5898a47deb2df5f7db4f9ef3fe8fa1e5a4a (diff) | |
| download | bootstrap-2eec3f919e7bd7ee847c2631ae9c53515cac1c8f.tar.xz bootstrap-2eec3f919e7bd7ee847c2631ae9c53515cac1c8f.zip | |
Merge branch 'master' into pr/10656
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less/normalize.less')
| -rw-r--r-- | less/normalize.less | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/less/normalize.less b/less/normalize.less index a2e9c6485..42a393fc0 100644 --- a/less/normalize.less +++ b/less/normalize.less @@ -1,4 +1,4 @@ -/*! normalize.css v2.1.0 | MIT License | git.io/normalize */ +/*! normalize.css v2.1.3 | MIT License | git.io/normalize */ // ========================================================================== // HTML5 display definitions @@ -44,10 +44,12 @@ audio:not([controls]) { } // -// Address styling not present in IE 8/9. +// Address `[hidden]` styling not present in IE 8/9. +// Hide the `template` element in IE, Safari, and Firefox < 22. // -[hidden] { +[hidden], +template { display: none; } @@ -63,8 +65,8 @@ audio:not([controls]) { html { font-family: sans-serif; // 1 - -webkit-text-size-adjust: 100%; // 2 -ms-text-size-adjust: 100%; // 2 + -webkit-text-size-adjust: 100%; // 2 } // @@ -80,6 +82,14 @@ body { // ========================================================================== // +// Remove the gray background color from active links in IE 10. +// + +a { + background: transparent; +} + +// // Address `outline` inconsistency between Chrome and other browsers. // @@ -329,8 +339,8 @@ html input[disabled] { } // -// 1. Address box sizing set to `content-box` in IE 8/9. -// 2. Remove excess padding in IE 8/9. +// 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"], |