Updated design
This commit is contained in:
parent
519c758fa9
commit
cba0321f96
|
@ -11,13 +11,11 @@ issuable_created = false
|
||||||
initTemplates: ->
|
initTemplates: ->
|
||||||
Issuable.labelRow = _.template(
|
Issuable.labelRow = _.template(
|
||||||
'<% _.each(labels, function(label){ %>
|
'<% _.each(labels, function(label){ %>
|
||||||
<span class="label-row">
|
<span class="label-row btn-group" role="group" aria-label="<%= _.escape(label.title) %>" style="color: <%= label.text_color %>;">
|
||||||
<a href="#">
|
<a href="#" class="btn btn-transparent has-tooltip" style="background-color: <%= label.color %>;" title="<%= _.escape(label.description) %>" data-container="body">
|
||||||
<span class="label color-label has-tooltip" style="background-color: <%= label.color %>; color: <%= label.text_color %>" title="<%= _.escape(label.description) %>" data-container="body">
|
<%= _.escape(label.title) %>
|
||||||
<%= _.escape(label.title) %>
|
|
||||||
</span>
|
|
||||||
</a>
|
</a>
|
||||||
<button type="button" class="btn btn-sm btn-transparent append-right-5 js-label-filter-remove" data-label="<%= _.escape(label.title) %>">
|
<button type="button" class="btn btn-transparent label-remove js-label-filter-remove" style="background-color: <%= label.color %>;" data-label="<%= _.escape(label.title) %>">
|
||||||
<i class="fa fa-times"></i>
|
<i class="fa fa-times"></i>
|
||||||
</button>
|
</button>
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -169,3 +169,20 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.filtered-labels {
|
||||||
|
.label-row {
|
||||||
|
&:not(:last-child) {
|
||||||
|
margin-right: 5px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.label-remove {
|
||||||
|
border-left: 1px solid;
|
||||||
|
z-index: 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn {
|
||||||
|
color: inherit;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
- labels.each do |label|
|
- labels.each do |label|
|
||||||
%span.label-row
|
%span.label-row.btn-group{ role: "group", aria: { label: escape_once(label.name) }, style: "color: #{text_color_for_bg(label.color)}" }
|
||||||
= link_to_label(label, tooltip: true)
|
= link_to namespace_project_label_path(@project.namespace, @project, label),
|
||||||
%button.btn.btn-sm.btn-transparent.append-right-5.js-label-filter-remove{ type: "button", data: { label: label.title } }
|
class: "btn btn-transparent has-tooltip",
|
||||||
|
style: "background-color: #{label.color};",
|
||||||
|
title: escape_once(label.description),
|
||||||
|
data: { container: "body" } do
|
||||||
|
= escape_once label.name
|
||||||
|
%button.btn.btn-transparent.label-remove.js-label-filter-remove{ type: "button", style: "background-color: #{label.color};", data: { label: label.title } }
|
||||||
= icon("times")
|
= icon("times")
|
||||||
|
|
Loading…
Reference in New Issue