Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-07-08 09:42:42 +02:00
Code Issues Packages Projects Releases Activity

Merged r15134 (#21263).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15199 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2016-03-12 08:25:44 +00:00
parent 225c972c11
commit c1ec49459b
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/wiki/_sidebar.html.erb
View File

@@ -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>

3
public/stylesheets/application.css
View File

@@ -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;}