diff options
| author | Mark Otto <[email protected]> | 2013-02-01 21:49:19 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-01 21:49:54 -0800 |
| commit | dad9889aeb703f7276a1c9e54e19df622ffadb99 (patch) | |
| tree | 238da98b5f0eab799dc7a858890ad4aee34add8f /less | |
| parent | d53af49afea5af5ac2c3cf74f0f5439b58021198 (diff) | |
| download | bootstrap-dad9889aeb703f7276a1c9e54e19df622ffadb99.tar.xz bootstrap-dad9889aeb703f7276a1c9e54e19df622ffadb99.zip | |
Fixes #6657: Upgrade Normalize to 2.1.0
Diffstat (limited to 'less')
| -rw-r--r-- | less/normalize.less | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/less/normalize.less b/less/normalize.less index 8d5b8019b..a2e9c6485 100644 --- a/less/normalize.less +++ b/less/normalize.less @@ -1,4 +1,4 @@ -/*! normalize.css v2.0.1 | MIT License | git.io/normalize */ +/*! normalize.css v2.1.0 | MIT License | git.io/normalize */ // ========================================================================== // HTML5 display definitions @@ -16,6 +16,7 @@ figure, footer, header, hgroup, +main, nav, section, summary { @@ -100,12 +101,13 @@ a:hover { // ========================================================================== // -// Address variable `h1` font size within `section` and `article` contexts in -// Firefox 4+, Safari 5, and Chrome. +// Address variable `h1` font-size and margin within `section` and `article` +// contexts in Firefox 4+, Safari 5, and Chrome. // h1 { font-size: 2em; + margin: 0.67em 0; } // @@ -130,7 +132,17 @@ strong { // dfn { - font-style: italic; + font-style: italic; +} + +// +// Address differences between Firefox and other browsers. +// + +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; } // @@ -159,9 +171,7 @@ samp { // pre { - white-space: pre; white-space: pre-wrap; - word-wrap: break-word; } // @@ -217,7 +227,7 @@ img { // svg:not(:root) { - overflow: hidden; + overflow: hidden; } // ========================================================================== @@ -229,7 +239,7 @@ svg:not(:root) { // figure { - margin: 0; + margin: 0; } // ========================================================================== @@ -282,6 +292,18 @@ input { } // +// 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 Chrome, Safari 5+, and IE 8+. +// Correct `select` style inheritance in Firefox 4+ and Opera. +// + +button, +select { + 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. |