From e3a0bf0b43f150f6a0594b948e6602ebbd4a0bc2 Mon Sep 17 00:00:00 2001 From: Nicolas Gallagher Date: Sun, 22 Jan 2012 23:19:51 +0000 Subject: [PATCH] Update normalize.css from master branch --- normalize.css | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/normalize.css b/normalize.css index 1e10e7d..367436b 100644 --- a/normalize.css +++ b/normalize.css @@ -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 @@ -58,16 +58,26 @@ audio:not([controls]) { /* * 1. Corrects text resizing oddly in IE6/7 when body font-size is set using em units * http://clagnut.com/blog/348/#c790 - * 2. Keeps page centred in all browsers regardless of content height - * 3. Prevents iOS text size adjust after orientation change, without disabling user zoom + * 2. 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/ */ html { font-size: 100%; /* 1 */ - overflow-y: scroll; /* 2 */ - -webkit-text-size-adjust: 100%; /* 3 */ - -ms-text-size-adjust: 100%; /* 3 */ + -webkit-text-size-adjust: 100%; /* 2 */ + -ms-text-size-adjust: 100%; /* 2 */ +} + +/* + * 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; } -/* - * Addresses font-family inconsistency between 'textarea' and other form elements. - */ - -body, -button, -input, -select, -textarea { - font-family: sans-serif; -} - /* ============================================================================= Links