typographical cleanup of list styles (also fixes FS#941)

darcs-hash:20081011120833-f7d6d-8ad166657e8ccfee792a4b391595a86c52865e8b.gz

2 files changed, 18 insertions, 7 deletions

diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 808693ff3..cadc78c2c 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -405,7 +405,7 @@ div.dokuwiki ul {
   line-height: 1.5em;
   list-style-type: square;
   list-style-image: none;
-  margin: 0 0 0.5em 1.5em;
+  margin: 0 0 1em 3.5em;
   color: __text_alt__;
 }
 
@@ -413,11 +413,19 @@ div.dokuwiki ul {
 div.dokuwiki ol {
   line-height: 1.5em;
   list-style-image: none;
-  margin: 0 0 0.5em 1.5em;
+  margin: 0 0 1em 3.5em;
   color: __text_alt__;
   font-weight: bold;
 }
 
+/* no gap in between nested lists */
+div.dokuwiki li ul {
+  margin-bottom: 0;
+}
+div.dokuwiki li ol {
+  margin-bottom: 0;
+}
+
 /* the list items overriding the ul/ol definition */
 div.dokuwiki .li {
   color: __text__;
diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css
index 83b8ceb31..0491a7ba0 100644
--- a/lib/tpl/default/print.css
+++ b/lib/tpl/default/print.css
@@ -114,20 +114,23 @@ img.mediaright {
 ul {
     line-height: 1.5em;
     list-style-type: square;
-    margin: 0 0 0.5em 1.5em;
+    margin: 0 0 1em 3.5em;
     padding: 0;
-
 }
 
 /* ordered lists */
 ol {
     line-height: 1.5em;
-    margin: 0 0 0.5em 2.5em;
+    margin: 0 0 1em 3.5em;
     padding: 0;
     font-weight: normal;
 }
-ol ol {
-    margin: 0 0 0.5em 1.5em;
+
+div.dokuwiki li ul {
+  margin-bottom: 0;
+}
+div.dokuwiki li ol {
+  margin-bottom: 0;
 }
 
 div.dokuwiki ol {list-style-type: decimal}