summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-07 18:12:15 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-07 18:12:15 +0200
commit1c3c232608538a2a7bb0b6b400343cad6de4a8fb (patch)
tree2403b99dee5520a1dd985c0bce7301be6c55ef3f
parent71158b11f2bba72c464a8307a19670fc71525682 (diff)
downloadgitlab-ce-1c3c232608538a2a7bb0b6b400343cad6de4a8fb.tar.gz
Revert "Put author name at the end of a tree row"
This reverts commit ee0fc2c3ad9608db91175e082fe1f6da19a3aec7.
-rw-r--r--app/assets/stylesheets/pages/tree.scss6
-rw-r--r--app/views/projects/tree/_tree_commit_column.html.haml5
2 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 642bcd943aa..34ee4d7b31e 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -60,7 +60,11 @@
}
.tree_author {
- padding-left: 8px;
+ padding-right: 8px;
+
+ .commit-author-name {
+ color: gray;
+ }
}
.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 86a80703072..50521264a61 100644
--- a/app/views/projects/tree/_tree_commit_column.html.haml
+++ b/app/views/projects/tree/_tree_commit_column.html.haml
@@ -1,6 +1,3 @@
%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)
- ]