Download as
Browse Code »

Commit 6ee3934028889c739eaf69e1c92b9854f7a29661

Authored by Dmitriy Zaporozhets
1 parent 34b0bea0
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Remove borders for wiki content. Fix wiki history UI 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 9 additions and 4 deletions   Show diff stats
app/views/projects/wikis/history.html.haml
  Diff comments   View file @6ee3934
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 %span.light History for 3 %span.light History for
4 = link_to @wiki.title.titleize, project_wiki_path(@project, @wiki) 4 = link_to @wiki.title.titleize, project_wiki_path(@project, @wiki)
5 5
6 -%table 6 +%table.table
7 %thead 7 %thead
8 %tr 8 %tr
9 %th Page version 9 %th Page version
app/views/projects/wikis/show.html.haml
  Diff comments   View file @6ee3934
@@ -7,9 +7,14 @@ @@ -7,9 +7,14 @@
7 This is an old version of this page. 7 This is an old version of this page.
8 You can view the #{link_to "most recent version", project_wiki_path(@project, @wiki)} or browse the #{link_to "history", history_project_wiki_path(@project, @wiki)}. 8 You can view the #{link_to "most recent version", project_wiki_path(@project, @wiki)} or browse the #{link_to "history", history_project_wiki_path(@project, @wiki)}.
9 9
10 -.file-holder  
11 - .file-content.wiki 10 +%hr
  11 +
  12 +.wiki-holder
  13 + .wiki
12 = preserve do 14 = preserve do
13 = render_wiki_content(@wiki) 15 = render_wiki_content(@wiki)
14 16
15 -%p.span Last edited by #{commit_author_link(@wiki.commit, avatar: true, size: 16)} #{time_ago_with_tooltip(@wiki.commit.created_at)} ago 17 +%hr
  18 +
  19 +.wiki-last-edit-by
  20 + Last edited by #{commit_author_link(@wiki.commit, avatar: true, size: 16)} #{time_ago_with_tooltip(@wiki.commit.created_at)} ago