Update normalize.css from master branch

This commit is contained in:
Nicolas Gallagher 2012-01-22 23:19:51 +00:00
parent bfcd8bdd0f
commit e3a0bf0b43

34
normalize.css vendored
View File

@ -1,4 +1,4 @@
/*! normalize.css 2012-01-17T16:33 UTC - http://github.com/necolas/normalize.css */ /*! normalize.css 2012-01-22T23:00 UTC - http://github.com/necolas/normalize.css */
/* ============================================================================= /* =============================================================================
HTML5 display definitions HTML5 display definitions
@ -58,16 +58,26 @@ audio:not([controls]) {
/* /*
* 1. Corrects text resizing oddly in IE6/7 when body font-size is set using em units * 1. Corrects text resizing oddly in IE6/7 when body font-size is set using em units
* http://clagnut.com/blog/348/#c790 * http://clagnut.com/blog/348/#c790
* 2. Keeps page centred in all browsers regardless of content height * 2. Prevents iOS text size adjust after orientation change, without disabling user zoom
* 3. Prevents iOS text size adjust after orientation change, without disabling user zoom
* www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/ * www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/
*/ */
html { html {
font-size: 100%; /* 1 */ font-size: 100%; /* 1 */
overflow-y: scroll; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */
-webkit-text-size-adjust: 100%; /* 3 */ -ms-text-size-adjust: 100%; /* 2 */
-ms-text-size-adjust: 100%; /* 3 */ }
/*
* Addresses font-family inconsistency between 'textarea' and other form elements.
*/
html,
button,
input,
select,
textarea {
font-family: sans-serif;
} }
/* /*
@ -78,18 +88,6 @@ body {
margin: 0; margin: 0;
} }
/*
* Addresses font-family inconsistency between 'textarea' and other form elements.
*/
body,
button,
input,
select,
textarea {
font-family: sans-serif;
}
/* ============================================================================= /* =============================================================================
Links Links