Merged r14201 (#13583).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14202 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index d8805ceaa2383c050b4a74fe0ea5802ac995c69d..c33bdb07a9d004e3cefd69b0a4a7af8f046c96b6 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -881,6 +881,7 @@ div.wiki a {word-wrap: break-word;}
 div.wiki a.new {color: #b73535;}
 
 div.wiki ul, div.wiki ol {margin-bottom:1em;}
+div.wiki li>ul, div.wiki li>ol {margin-bottom: 0;}
 
 div.wiki pre {
   margin: 1em 1em 1em 1.6em;