Skip to content

Commit

Permalink
Manual merge with GitHub master branch
Browse files Browse the repository at this point in the history
  • Loading branch information
necolas committed Feb 7, 2012
2 parents 6fc4111 + e469f75 commit e65602a
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions normalize.css
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,10 @@ sub {
Lists
========================================================================== */

/*
* Addresses margins set differently in IE6/7
*/

dl,
menu,
ol,
Expand All @@ -271,15 +275,23 @@ ul {
margin: 1em 0;
}

dd {
margin: 0 0 0 40px;
}

/*
* Addresses paddings set differently in IE6/7
*/

menu,
ol,
ul {
padding: 0 0 0 40px;
}

dd {
margin: 0 0 0 40px;
}
/*
* Corrects list images handled incorrectly in IE7
*/

nav ul,
nav ol {
Expand Down

0 comments on commit e65602a

Please sign in to comment.