diff options
| author | Phil Hughes <me@iamphill.com> | 2016-10-25 17:29:00 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-10-25 17:29:00 +0100 |
| commit | 13f170fc5d182da78c3d0a7a0885628f59420ea0 (patch) | |
| tree | 78272fd61277b8be3d23ce9e7e4789cabe036ac4 | |
| parent | 19367b77776153696c4eda2b5d546e660357e965 (diff) | |
| download | gitlab-ce-13f170fc5d182da78c3d0a7a0885628f59420ea0.tar.gz | |
Moved avatar infront of labels
| -rw-r--r-- | app/assets/stylesheets/pages/boards.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/boards/components/_card.html.haml | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index 4d358f96c92..ef6833c9845 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -229,6 +229,10 @@ margin-right: 5px; font-size: (14px / $issue-boards-font-size) * 1em; } + + .avatar { + margin-left: 0; + } } .card-number { diff --git a/app/views/projects/boards/components/_card.html.haml b/app/views/projects/boards/components/_card.html.haml index 5cfd42485c5..22c1dfa84fc 100644 --- a/app/views/projects/boards/components/_card.html.haml +++ b/app/views/projects/boards/components/_card.html.haml @@ -21,6 +21,11 @@ %span.card-number{ "v-if" => "issue.id" } = precede '#' do {{ issue.id }} + %a.has-tooltip{ ":href" => "'/' + issue.assignee.username", + ":title" => "'Assigned to ' + issue.assignee.name", + "v-if" => "issue.assignee", + data: { container: 'body' } } + %img.avatar.avatar-inline.s20{ ":src" => "issue.assignee.avatar", width: 20, height: 20 } %button.label.color-label.has-tooltip{ "v-for" => "label in issue.labels", type: "button", "v-if" => "(!list.label || label.id !== list.label.id)", @@ -29,8 +34,3 @@ ":title" => "label.description", data: { container: 'body' } } {{ label.title }} - %a.has-tooltip{ ":href" => "'/' + issue.assignee.username", - ":title" => "'Assigned to ' + issue.assignee.name", - "v-if" => "issue.assignee", - data: { container: 'body' } } - %img.avatar.avatar-inline.s20{ ":src" => "issue.assignee.avatar", width: 20, height: 20 } |