Merged r15134 (#21263).

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

diff --git a/app/views/wiki/_sidebar.html.erb b/app/views/wiki/_sidebar.html.erb
index 7208376dceeedb4e7f5893a3c7d9a30566b2146e..a8e4110c1bf45d202f960cdb685790a19b328e15 100644 (file)
--- a/app/views/wiki/_sidebar.html.erb
+++ b/app/views/wiki/_sidebar.html.erb
@@ -1,5 +1,7 @@
 <% if @wiki && @wiki.sidebar -%>
-  <%= textilizable @wiki.sidebar.content, :text %>
+  <div class="wiki">
+    <%= textilizable @wiki.sidebar.content, :text %>
+  </div>
 <% end -%>
 
 <h3><%= l(:label_wiki) %></h3>

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 28859202747c270112927ad87c101b88a1ef33a9..2bb3804b32b777815592372d72580396df7f07ba 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -79,6 +79,9 @@ pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;}
 #sidebar .contextual { margin-right: 1em; }
 #sidebar ul, ul.flat {margin: 0;  padding: 0;}
 #sidebar ul li, ul.flat li {list-style-type:none;margin: 0px 2px 0px 0px; padding: 0px 0px 0px 0px;}
+#sidebar div.wiki h3 {font-size:13px; margin-top:0; color:#555;}
+#sidebar div.wiki ul {margin:inherit; padding-left:40px;}
+#sidebar div.wiki ul li {list-style-type:inherit;}
 
 #content { width: 75%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; }
 * html #content{ width: 75%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}