diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-06 08:59:25 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-06 08:59:25 +0000 |
| commit | 4b3b286eef64917247be032f67af1a062aac0254 (patch) | |
| tree | c905a6df16ca3021d866865dc90ffe78260521f9 | |
| parent | 863f61343a5a51b3b6a1c596353ecdfd6c20d523 (diff) | |
| parent | ee0fc2c3ad9608db91175e082fe1f6da19a3aec7 (diff) | |
| download | gitlab-ce-4b3b286eef64917247be032f67af1a062aac0254.tar.gz | |
Merge branch 'tree-author-at-end' into 'master'
Put author name at the end of a tree row
Put author name at the end of a tree row as the commit message is more important than the author name.
See merge request !579
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/tree/_tree_commit_column.html.haml | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 34ee4d7b31e..642bcd943aa 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -60,11 +60,7 @@ } .tree_author { - padding-right: 8px; - - .commit-author-name { - color: gray; - } + padding-left: 8px; } .tree_commit { diff --git a/app/views/projects/tree/_tree_commit_column.html.haml b/app/views/projects/tree/_tree_commit_column.html.haml index 50521264a61..86a80703072 100644 --- a/app/views/projects/tree/_tree_commit_column.html.haml +++ b/app/views/projects/tree/_tree_commit_column.html.haml @@ -1,3 +1,6 @@ %span.str-truncated - %span.tree_author= commit_author_link(commit, avatar: true, size: 16) = link_to_gfm commit.title, namespace_project_commit_path(@project.namespace, @project, commit.id), class: "tree-commit-link" + %span.tree_author + [ + commit_author_link(commit, avatar: false) + ] |