Permalink
Browse files

Manual merge with GitHub master branch

  • Loading branch information...
2 parents 6fc4111 + e469f75 commit e65602a3b977fc4de8fbd5a9010b09023a09ef30 @necolas necolas committed Feb 7, 2012
Showing with 15 additions and 3 deletions.
  1. +15 −3 normalize.css
View
@@ -262,6 +262,10 @@ sub {
Lists
========================================================================== */
+/*
+ * Addresses margins set differently in IE6/7
+ */
+
dl,
menu,
ol,
@@ -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 {

0 comments on commit e65602a

Please sign in to comment.