diff --git a/app/views/wiki/_sidebar.html.erb b/app/views/wiki/_sidebar.html.erb index 7208376..a8e4110 100644 --- 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 %> +
+ <%= textilizable @wiki.sidebar.content, :text %> +
<% end -%>

<%= l(:label_wiki) %>

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 78cb1a4..8ead435 100644 --- 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;}