diff --git a/mozilla/layout/html/document/src/ua.css b/mozilla/layout/html/document/src/ua.css
index eadcf9c1ac3..32d72042964 100644
--- a/mozilla/layout/html/document/src/ua.css
+++ b/mozilla/layout/html/document/src/ua.css
@@ -324,20 +324,24 @@ ol {
counter-reset: -html-counter 0;
}
+/* make orphaned li's have inside bullet */
li {
display: list-item;
list-style-position: inside;
}
+/* restore outside position for lists inside li's */
li ul, li ol, li dir, li menu {
list-style-position: outside;
}
-ul li, dir li, menu li, ol li {
- list-style-position: inherit;
+/* undo previous two rules for properly nested lists */
+ul li, dir li, menu li, ol li,
+ul ul, ul dir, ul menu, ul ol, dir ul, dir dir, dir menu, dir ol, menu ul, menu
+dir, menu menu, menu ol, ol ul, ol dir, ol menu, ol ol {
+ list-style-position: inherit;
}
-
/* nested lists have no top/bottom margins */
ul ul, ul ol, ul menu, ul dir,
menu ul, menu ol, menu menu, menu dir,
diff --git a/mozilla/layout/style/ua.css b/mozilla/layout/style/ua.css
index eadcf9c1ac3..32d72042964 100644
--- a/mozilla/layout/style/ua.css
+++ b/mozilla/layout/style/ua.css
@@ -324,20 +324,24 @@ ol {
counter-reset: -html-counter 0;
}
+/* make orphaned li's have inside bullet */
li {
display: list-item;
list-style-position: inside;
}
+/* restore outside position for lists inside li's */
li ul, li ol, li dir, li menu {
list-style-position: outside;
}
-ul li, dir li, menu li, ol li {
- list-style-position: inherit;
+/* undo previous two rules for properly nested lists */
+ul li, dir li, menu li, ol li,
+ul ul, ul dir, ul menu, ul ol, dir ul, dir dir, dir menu, dir ol, menu ul, menu
+dir, menu menu, menu ol, ol ul, ol dir, ol menu, ol ol {
+ list-style-position: inherit;
}
-
/* nested lists have no top/bottom margins */
ul ul, ul ol, ul menu, ul dir,
menu ul, menu ol, menu menu, menu dir,