#223341 by bonzinip, Jody Lynn: Fix over-aggressive menu markup that overrides ordered lists.

2 files changed, 8 insertions, 14 deletions

diff --git a/modules/system/system-menus-rtl.css b/modules/system/system-menus-rtl.css
index 4ef54c390..c77dbf3ab 100644
--- a/modules/system/system-menus-rtl.css
+++ b/modules/system/system-menus-rtl.css
@@ -6,13 +6,9 @@ ul.menu {
 ul.menu li {
   margin: 0 0.5em 0 0;
 }
-li.expanded {
-  padding: 0.2em 0 0 0.5em;
-}
-li.collapsed {
+ul li.collapsed {
   list-style-image: url(../../misc/menu-collapsed-rtl.png);
-  padding: 0.2em 0 0 0.5em;
 }
-li.leaf {
+li.expanded, li.collapsed, li.leaf {
   padding: 0.2em 0 0 0.5em;
 }
diff --git a/modules/system/system-menus.css b/modules/system/system-menus.css
index 369dcc4e7..7a6a9e8cf 100644
--- a/modules/system/system-menus.css
+++ b/modules/system/system-menus.css
@@ -8,21 +8,19 @@ ul.menu {
 ul.menu li {
   margin: 0 0 0 0.5em; /* LTR */
 }
-li.expanded {
+ul li.expanded {
   list-style-type: circle;
-  list-style-image: url(../../misc/menu-expanded.png);
-  padding: 0.2em 0.5em 0 0; /* LTR */
-  margin: 0;
+  list-style-image: url(../../misc/menu-expanded.png); 
 }
-li.collapsed {
+ul li.collapsed {
   list-style-type: disc;
   list-style-image: url(../../misc/menu-collapsed.png); /* LTR */
-  padding: 0.2em 0.5em 0 0; /* LTR */
-  margin: 0;
 }
-li.leaf {
+ul li.leaf {
   list-style-type: square;
   list-style-image: url(../../misc/menu-leaf.png);
+}
+li.expanded, li.collapsed, li.leaf {
   padding: 0.2em 0.5em 0 0; /* LTR */
   margin: 0;
 }