diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 17:24:29 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 17:24:29 +0300 |
| commit | 50b1f09ab2b07c41819801b63a882d850954543d (patch) | |
| tree | 2bb62d13dc3c93cac1b9bc31be242dd7d7505e22 /app | |
| parent | cf6e58b589713acae3cfeab55bdf1944bbf682a1 (diff) | |
Small UI improvements to git blame page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/generic/files.scss | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/blame/show.html.haml | 19 |
3 files changed, 17 insertions, 13 deletions
diff --git a/app/assets/stylesheets/generic/files.scss b/app/assets/stylesheets/generic/files.scss index 8014dcb165b..f845342c67b 100644 --- a/app/assets/stylesheets/generic/files.scss +++ b/app/assets/stylesheets/generic/files.scss @@ -90,12 +90,7 @@ border-right: none; } background: #fff; - padding: 5px; - } - .author, - .blame_commit { - background: $background-color; - vertical-align: top; + padding: 8px; } .lines { pre { diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 34ee4d7b31e..092918e4de1 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -89,6 +89,10 @@ td.blame-commit { background: #f9f9f9; min-width: 350px; + + .commit-author-link { + color: #888; + } } td.blame-numbers { pre { diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml index 1705bda3074..05d5db5d3fe 100644 --- a/app/views/projects/blame/show.html.haml +++ b/app/views/projects/blame/show.html.haml @@ -16,14 +16,19 @@ - @blame.each do |raw_commit, line| %tr %td.blame-commit - %span.commit + .commit - unless @prev_commit && @prev_commit.sha == raw_commit.sha - commit = Commit.new(raw_commit, @project) - = link_to commit.short_id, namespace_project_commit_path(@project.namespace, @project, commit), class: "commit_short_id" - - = commit_author_link(commit, avatar: true, size: 16) - - = link_to_gfm truncate(commit.title, length: 20), namespace_project_commit_path(@project.namespace, @project, commit.id), class: "row_title" + .commit-row-title + %strong + = link_to_gfm truncate(commit.title, length: 35), namespace_project_commit_path(@project.namespace, @project, commit.id), class: "cdark" + .pull-right + = link_to commit.short_id, namespace_project_commit_path(@project.namespace, @project, commit), class: "monospace" + + .light + = commit_author_link(commit, avatar: false) + authored + #{time_ago_with_tooltip(commit.committed_date)} - @prev_commit = raw_commit %td.lines.blame-numbers %pre @@ -34,4 +39,4 @@ %code :erb <%= highlight(@blob.name, line, nowrap: true, continue: true).html_safe %> -
\ No newline at end of file + |