Commit f7674c73 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'multiple-assignees-fe-issues-list' into 'multiple_assignees_review'

Add multiple assignees to issues list

See merge request !1509
parents 0e09fdc9 ffcbf5d4
...@@ -93,3 +93,14 @@ ...@@ -93,3 +93,14 @@
align-self: center; align-self: center;
} }
} }
.avatar-counter {
background-color: $gray-darkest;
color: $white-light;
border: 1px solid $avatar-counter-border-color;
border-radius: 1em;
font-family: $regular_font;
font-size: 9px;
line-height: 16px;
text-align: center;
}
...@@ -261,6 +261,7 @@ ul.controls { ...@@ -261,6 +261,7 @@ ul.controls {
.avatar-inline { .avatar-inline {
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
margin-bottom: 0;
} }
} }
} }
......
...@@ -439,6 +439,7 @@ $help-shortcut-header-color: #333; ...@@ -439,6 +439,7 @@ $help-shortcut-header-color: #333;
$issues-today-bg: #f3fff2; $issues-today-bg: #f3fff2;
$issues-today-border: #e1e8d5; $issues-today-border: #e1e8d5;
$compare-display-color: #888; $compare-display-color: #888;
$avatar-counter-border-color: #e6e6e6;
/* /*
* jQuery UI * jQuery UI
......
...@@ -481,6 +481,16 @@ ...@@ -481,6 +481,16 @@
vertical-align: text-top; vertical-align: text-top;
} }
} }
.avatar-counter {
display: inline-block;
vertical-align: middle;
min-width: 16px;
line-height: 14px;
height: 16px;
padding-left: 2px;
padding-right: 2px;
}
} }
} }
......
...@@ -15,8 +15,7 @@ ...@@ -15,8 +15,7 @@
- if issue.assignees.any? - if issue.assignees.any?
%li %li
- issue.assignees.each do |assignee| = render 'shared/issuable/assignees', project: @project, issue: issue
= link_to_member(@project, assignee, name: false, title: "Assigned to :name")
= render 'shared/issuable_meta_data', issuable: issue = render 'shared/issuable_meta_data', issuable: issue
......
- max_render = 3
- max = [max_render, issue.assignees.length].min
- issue.assignees.each_with_index do |assignee, index|
- if index < max
= link_to_member(@project, assignee, name: false, title: "Assigned to :name")
- if issue.assignees.length > max_render
- counter = issue.assignees.length - max_render
%span{ class: 'avatar-counter has-tooltip', data: { container: 'body', placement: 'bottom', 'line-type' => 'old', 'original-title' => "+#{counter} more assignees" } }
- if counter < 99
= "+#{counter}"
- else
99+
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment