From 6ee3934028889c739eaf69e1c92b9854f7a29661 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sun, 29 Dec 2013 18:13:16 +0200 Subject: [PATCH] Remove borders for wiki content. Fix wiki history UI --- app/views/projects/wikis/history.html.haml | 2 +- app/views/projects/wikis/show.html.haml | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/views/projects/wikis/history.html.haml b/app/views/projects/wikis/history.html.haml index cb79540..c9c6132 100644 --- a/app/views/projects/wikis/history.html.haml +++ b/app/views/projects/wikis/history.html.haml @@ -3,7 +3,7 @@ %span.light History for = link_to @wiki.title.titleize, project_wiki_path(@project, @wiki) -%table +%table.table %thead %tr %th Page version diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml index 0ec9892..3d00940 100644 --- a/app/views/projects/wikis/show.html.haml +++ b/app/views/projects/wikis/show.html.haml @@ -7,9 +7,14 @@ This is an old version of this page. 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)}. -.file-holder - .file-content.wiki +%hr + +.wiki-holder + .wiki = preserve do = render_wiki_content(@wiki) -%p.span Last edited by #{commit_author_link(@wiki.commit, avatar: true, size: 16)} #{time_ago_with_tooltip(@wiki.commit.created_at)} ago +%hr + +.wiki-last-edit-by + Last edited by #{commit_author_link(@wiki.commit, avatar: true, size: 16)} #{time_ago_with_tooltip(@wiki.commit.created_at)} ago -- libgit2 0.21.2