diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-06-06 18:52:53 +0300 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-06-06 18:52:53 +0300 |
| commit | 282338d8f5fbef1b3bead07e9ca7b339bd781b85 (patch) | |
| tree | 6a8c30f5fc5a9af399112ea6b8f7a48ed6e4a9a3 /app | |
| parent | 8a70bbad566865bd35744673d5dda38ca0c90d96 (diff) | |
UX review
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 2 | ||||
| -rw-r--r-- | app/views/groups/labels/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_label.html.haml | 15 |
3 files changed, 9 insertions, 10 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index 712e881de6f..27b436eb224 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -58,7 +58,7 @@ } .color-label { - padding: 0 $grid-size; + padding: $gl-padding-4 $grid-size; line-height: 16px; border-radius: $label-border-radius; color: $white-light; diff --git a/app/views/groups/labels/index.html.haml b/app/views/groups/labels/index.html.haml index e6b20385792..9c31bbee295 100644 --- a/app/views/groups/labels/index.html.haml +++ b/app/views/groups/labels/index.html.haml @@ -16,8 +16,6 @@ .top-area.adjust .nav-text = _('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 .other-labels diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml index 658d546a4a4..4725951b22d 100644 --- a/app/views/shared/_label.html.haml +++ b/app/views/shared/_label.html.haml @@ -14,13 +14,14 @@ - if @project %li.inline .label-badge.label-badge-gray= label.model_name.human.capitalize - - if can?(current_user, :admin_label, @project) - %li.inline.js-toggle-priority{ data: { url: remove_priority_project_label_path(@project, label), - 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') } - = sprite_icon('star-o') - %button.label-action.remove-priority.btn.btn-transparent.has-tooltip{ title: _('Remove priority'), type: 'button', data: { placement: 'top' }, aria_label: _('Deprioritize label') } - = sprite_icon('star') + - if can?(current_user, :admin_label, label) + - if @project + %li.inline.js-toggle-priority{ data: { url: remove_priority_project_label_path(@project, label), + 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') } + = sprite_icon('star-o') + %button.label-action.remove-priority.btn.btn-transparent.has-tooltip{ title: _('Remove priority'), type: 'button', data: { placement: 'top' }, aria_label: _('Deprioritize label') } + = sprite_icon('star') %li.inline = link_to edit_label_path(label), class: 'btn btn-transparent label-action', aria_label: 'Edit label' do = sprite_icon('pencil') |