Commit 282338d8 authored by Luke Bennett's avatar Luke Bennett

UX review

parent 8a70bbad
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
} }
.color-label { .color-label {
padding: 0 $grid-size; padding: $gl-padding-4 $grid-size;
line-height: 16px; line-height: 16px;
border-radius: $label-border-radius; border-radius: $label-border-radius;
color: $white-light; color: $white-light;
......
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
.top-area.adjust .top-area.adjust
.nav-text .nav-text
= _('Labels can be applied to %{features}. Group labels are available for any project within the group.') % { features: issuables.to_sentence } = _('Labels can be applied to %{features}. Group labels are available for any project within the group.') % { features: issuables.to_sentence }
- if can_admin_label
= _('Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging.')
.labels-container.prepend-top-5 .labels-container.prepend-top-5
.other-labels .other-labels
......
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
- if @project - if @project
%li.inline %li.inline
.label-badge.label-badge-gray= label.model_name.human.capitalize .label-badge.label-badge-gray= label.model_name.human.capitalize
- if can?(current_user, :admin_label, @project) - if can?(current_user, :admin_label, label)
- if @project
%li.inline.js-toggle-priority{ data: { url: remove_priority_project_label_path(@project, label), %li.inline.js-toggle-priority{ data: { url: remove_priority_project_label_path(@project, label),
dom_id: dom_id(label), type: label.type } } dom_id: dom_id(label), type: label.type } }
%button.label-action.add-priority.btn.btn-transparent.has-tooltip{ title: _('Prioritize'), type: 'button', data: { placement: 'top' }, aria_label: _('Prioritize label') } %button.label-action.add-priority.btn.btn-transparent.has-tooltip{ title: _('Prioritize'), type: 'button', data: { placement: 'top' }, aria_label: _('Prioritize label') }
......
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