Commit 607d8b7970b3bfc007030f978fcee00623cda743
1 parent
71667390
Exists in
master
and in
4 other branches
Wiki Style Fixing
Showing
3 changed files
with
12 additions
and
4 deletions
Show diff stats
app/assets/stylesheets/main.scss
app/views/wikis/show.html.haml
@@ -10,10 +10,9 @@ | @@ -10,10 +10,9 @@ | ||
10 | %i.icon-edit | 10 | %i.icon-edit |
11 | Edit | 11 | Edit |
12 | %br | 12 | %br |
13 | -.file_holder | ||
14 | - .file_content.wiki | ||
15 | - = preserve do | ||
16 | - = markdown @wiki.content | 13 | +.file_content.wiki |
14 | + = preserve do | ||
15 | + = markdown @wiki.content | ||
17 | 16 | ||
18 | %p.time Last edited by #{@wiki.user.name}, #{time_ago_in_words @wiki.created_at} ago | 17 | %p.time Last edited by #{@wiki.user.name}, #{time_ago_in_words @wiki.created_at} ago |
19 | - if can? current_user, :admin_wiki, @project | 18 | - if can? current_user, :admin_wiki, @project |