Manual merge with GitHub master branch

This commit is contained in:
Nicolas Gallagher 2012-02-07 01:55:13 +00:00
commit e65602a3b9

18
normalize.css vendored
View File

@ -262,6 +262,10 @@ sub {
Lists Lists
========================================================================== */ ========================================================================== */
/*
* Addresses margins set differently in IE6/7
*/
dl, dl,
menu, menu,
ol, ol,
@ -271,15 +275,23 @@ ul {
margin: 1em 0; margin: 1em 0;
} }
dd {
margin: 0 0 0 40px;
}
/*
* Addresses paddings set differently in IE6/7
*/
menu, menu,
ol, ol,
ul { ul {
padding: 0 0 0 40px; padding: 0 0 0 40px;
} }
dd { /*
margin: 0 0 0 40px; * Corrects list images handled incorrectly in IE7
} */
nav ul, nav ul,
nav ol { nav ol {