Update normalize.css from master branch

This commit is contained in:
Nicolas Gallagher 2012-02-07 11:37:28 +00:00
parent 38f540b338
commit 579ebabe4d

17
normalize.css vendored
View File

@ -1,4 +1,4 @@
/*! normalize.css 2012-02-07T01:46 UTC - http://github.com/necolas/normalize.css */ /*! normalize.css 2012-02-07T10:31 UTC - http://github.com/necolas/normalize.css */
/* ============================================================================= /* =============================================================================
HTML5 display definitions HTML5 display definitions
@ -117,8 +117,8 @@ a:active {
========================================================================== */ ========================================================================== */
/* /*
* Neutralise smaller font-size in 'section' and 'article' in FF4+, Chrome, S5 * Addresses font sizes and margins set differently in IE6/7
* Fix IE6/7 heading font-size not being relative to the root font-size * Addresses font sizes within 'section' and 'article' in FF4+, Chrome, S5
*/ */
h1 { h1 {
@ -189,6 +189,15 @@ mark {
color: #000; color: #000;
} }
/*
* Addresses margins set differently in IE6/7
*/
p,
pre {
margin: 1em 0;
}
/* /*
* Corrects font family set oddly in IE6, S4/5, Chrome * Corrects font family set oddly in IE6, S4/5, Chrome
* en.wikipedia.org/wiki/User:Davidgothberg/Test59 * en.wikipedia.org/wiki/User:Davidgothberg/Test59
@ -269,8 +278,6 @@ sub {
dl, dl,
menu, menu,
ol, ol,
p,
pre,
ul { ul {
margin: 1em 0; margin: 1em 0;
} }