SAK-30751 <ol> bullet points are misaligned and missing their numbers

This also resolves SAK-30750 bullet points appear outside of page area
vishu77 · Apr 19, 2016 · 4ed9ca1 · 4ed9ca1
1 parent 5f59d6c
commit 4ed9ca1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/rwiki/rwiki-tool/tool/src/webapp/styles/wikiStyle.css b/rwiki/rwiki-tool/tool/src/webapp/styles/wikiStyle.css
@@ -816,8 +816,15 @@ h6 {
 }
 /* wiki lists */
 ul {padding:.5em;list-style-position:inside;}
+.rwikiRenderedContent ul,.rwiki_renderedContent ul{
+	padding: 0 0 0 2em;
+}
 ul.minus { list-style-type: square }
 ul.star { list-style-type: circle }
+ol {
+	padding: 0 0 0 2em !important;
+}
+ol.decimal { list-style-type: decimal}
 ol.roman { list-style-type: lower-roman }
 ol.ROMAN { list-style-type: upper-roman }
 ol.alpha { list-style-type: lower-alpha }

diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/filter/ListFilter.java b/rwiki/rwiki-util/radeox/src/java/org/radeox/filter/ListFilter.java
@@ -70,7 +70,7 @@ public ListFilter()
 		super();
 		openList.put(new Character('-'), "<ul class=\"minus\">");
 		openList.put(new Character('*'), "<ul class=\"star\">");
-		openList.put(new Character('#'), "<ol>");
+		openList.put(new Character('#'), "<ol class=\"decimal\">");
 		openList.put(new Character('i'), "<ol class=\"roman\">");
 		openList.put(new Character('I'), "<ol class=\"ROMAN\">");
 		openList.put(new Character('a'), "<ol class=\"alpha\">");