diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss index 8772de5f1fe64049ae128490bfbb6831d3b7d577..bb246dc90c848997d36e0e01eaa3cc1ff5b82980 100644 --- a/app/assets/stylesheets/pages/milestone.scss +++ b/app/assets/stylesheets/pages/milestone.scss @@ -15,3 +15,15 @@ li.milestone { .time-elapsed { color: #F14539; } + +.issue-row .assignee-icon { + .color-label { + float: left; + padding: 8px; + margin-left: 10px; + } + + img { + margin-left: 8px; + } +} diff --git a/app/views/projects/milestones/_issue.html.haml b/app/views/projects/milestones/_issue.html.haml index 133d802aaca1646f60211d3843fa0491b950f7d6..599fb7ef5aa90bdf06a400cea92a690fa6f40814 100644 --- a/app/views/projects/milestones/_issue.html.haml +++ b/app/views/projects/milestones/_issue.html.haml @@ -1,7 +1,9 @@ %li{ id: dom_id(issue, 'sortable'), class: 'issue-row', 'data-iid' => issue.iid, 'data-url' => issue_path(issue) } .pull-right.assignee-icon + - issue.labels.each do |label| + = render_colored_label(label) - if issue.assignee - = image_tag avatar_icon(issue.assignee, 16), class: "avatar s16", alt: '' + = image_tag avatar_icon(issue.assignee, 16), class: "avatar s24", alt: '' %span = link_to [@project.namespace.becomes(Namespace), @project, issue] do %span.cgray ##{issue.iid}