Commit 50b1f09a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Small UI improvements to git blame page

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent cf6e58b5
...@@ -90,12 +90,7 @@ ...@@ -90,12 +90,7 @@
border-right: none; border-right: none;
} }
background: #fff; background: #fff;
padding: 5px; padding: 8px;
}
.author,
.blame_commit {
background: $background-color;
vertical-align: top;
} }
.lines { .lines {
pre { pre {
......
...@@ -89,6 +89,10 @@ ...@@ -89,6 +89,10 @@
td.blame-commit { td.blame-commit {
background: #f9f9f9; background: #f9f9f9;
min-width: 350px; min-width: 350px;
.commit-author-link {
color: #888;
}
} }
td.blame-numbers { td.blame-numbers {
pre { pre {
......
...@@ -16,14 +16,19 @@ ...@@ -16,14 +16,19 @@
- @blame.each do |raw_commit, line| - @blame.each do |raw_commit, line|
%tr %tr
%td.blame-commit %td.blame-commit
%span.commit .commit
- unless @prev_commit && @prev_commit.sha == raw_commit.sha - unless @prev_commit && @prev_commit.sha == raw_commit.sha
- commit = Commit.new(raw_commit, @project) - commit = Commit.new(raw_commit, @project)
= link_to commit.short_id, namespace_project_commit_path(@project.namespace, @project, commit), class: "commit_short_id" .commit-row-title
&nbsp; %strong
= commit_author_link(commit, avatar: true, size: 16) = link_to_gfm truncate(commit.title, length: 35), namespace_project_commit_path(@project.namespace, @project, commit.id), class: "cdark"
&nbsp; .pull-right
= link_to_gfm truncate(commit.title, length: 20), namespace_project_commit_path(@project.namespace, @project, commit.id), class: "row_title" = link_to commit.short_id, namespace_project_commit_path(@project.namespace, @project, commit), class: "monospace"
&nbsp;
.light
= commit_author_link(commit, avatar: false)
authored
#{time_ago_with_tooltip(commit.committed_date)}
- @prev_commit = raw_commit - @prev_commit = raw_commit
%td.lines.blame-numbers %td.lines.blame-numbers
%pre %pre
...@@ -34,4 +39,4 @@ ...@@ -34,4 +39,4 @@
%code %code
:erb :erb
<%= highlight(@blob.name, line, nowrap: true, continue: true).html_safe %> <%= highlight(@blob.name, line, nowrap: true, continue: true).html_safe %>
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment