From 849ededd87b8487c509b123d26f57bc6bec92b3c Mon Sep 17 00:00:00 2001 From: Nicolas Gallagher Date: Tue, 31 Jan 2012 16:07:49 +0000 Subject: [PATCH] Update normalize.css and demo.html from master branch --- demo.html | 9 ++++++--- normalize.css | 49 +++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/demo.html b/demo.html index da2854a..a625810 100644 --- a/demo.html +++ b/demo.html @@ -1,8 +1,8 @@ - + - + Normalize CSS @@ -291,10 +291,13 @@

+

+

+

@@ -318,7 +321,7 @@
-
+
diff --git a/normalize.css b/normalize.css index 367436b..6f90edd 100644 --- a/normalize.css +++ b/normalize.css @@ -1,4 +1,4 @@ -/*! normalize.css 2012-01-22T23:00 UTC - http://github.com/necolas/normalize.css */ +/*! normalize.css 2012-01-31T16:06 UTC - http://github.com/necolas/normalize.css */ /* ============================================================================= HTML5 display definitions @@ -118,10 +118,37 @@ a:active { /* * Neutralise smaller font-size in 'section' and 'article' in FF4+, Chrome, S5 + * Fix IE6/7 heading font-size not being relative to the root font-size */ h1 { font-size: 2em; + margin: 0.67em 0; +} + +h2 { + font-size: 1.5em; + margin: 0.83em 0; +} + +h3 { + font-size: 1.17em; + margin: 1em 0; +} + +h4 { + font-size: 1em; + margin: 1.33em 0; +} + +h5 { + font-size: 0.83em; + margin: 1.67em 0; +} + +h6 { + font-size: 0.75em; + margin: 2.33em 0; } /* @@ -365,6 +392,15 @@ input[type="submit"] { *overflow: visible; /* 3 */ } +/* + * Re-set default cursor for disabled elements + */ + +button[disabled], +input[disabled] { + cursor: default; +} + /* * 1. Addresses box sizing set to content-box in IE8/9 * 2. Removes excess padding in IE8/9 @@ -393,17 +429,10 @@ input[type="search"] { } /* - * Removes inner padding that is displayed in S5, Chrome on OS X - */ - -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -/* - * Removes search cancel button in S5, Chrome on OS X + * Removes inner padding and search cancel button in S5, Chrome on OS X */ +input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; }