Commit 89271745 authored by Luke Bennett's avatar Luke Bennett

UX review changes

parent c7925014
...@@ -234,9 +234,10 @@ ...@@ -234,9 +234,10 @@
.label-badge { .label-badge {
color: $theme-gray-900; color: $theme-gray-900;
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-normal;
padding: $gl-padding-4; padding: $gl-padding-4 $gl-padding-8;
border-radius: $border-radius-default; border-radius: $border-radius-default;
font-size: $label-font-size;
} }
.label-badge-blue { .label-badge-blue {
...@@ -312,4 +313,8 @@ ...@@ -312,4 +313,8 @@
} }
} }
} }
}
.priority-labels-empty-state .svg-content img {
max-width: 114px;
} }
\ No newline at end of file
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
.prioritized-labels{ class: ('hide' if hide) } .prioritized-labels{ class: ('hide' if hide) }
%h5.prepend-top-0 Prioritized Labels %h5.prepend-top-0 Prioritized Labels
%ul.content-list.manage-labels-list.js-prioritized-labels %ul.content-list.manage-labels-list.js-prioritized-labels
#js-priority-labels-empty-state{ class: "#{'hidden' unless @prioritized_labels.empty?}" } #js-priority-labels-empty-state.priority-labels-empty-state{ class: "#{'hidden' unless @prioritized_labels.empty?}" }
= render 'shared/empty_states/priority_labels' = render 'shared/empty_states/priority_labels'
- if @prioritized_labels.present? - if @prioritized_labels.present?
= render partial: 'shared/label', subject: @group, collection: @prioritized_labels, as: :label = render partial: 'shared/label', subject: @group, collection: @prioritized_labels, as: :label
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
.prioritized-labels{ class: ('hide' if hide) } .prioritized-labels{ class: ('hide' if hide) }
%h5.prepend-top-0 Prioritized Labels %h5.prepend-top-0 Prioritized Labels
%ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_priorities_project_labels_path(@project) } %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_priorities_project_labels_path(@project) }
#js-priority-labels-empty-state{ class: "#{'hidden' unless @prioritized_labels.empty?}" } #js-priority-labels-empty-state.priority-labels-empty-state{ class: "#{'hidden' unless @prioritized_labels.empty?}" }
= render 'shared/empty_states/priority_labels' = render 'shared/empty_states/priority_labels'
- if @prioritized_labels.present? - if @prioritized_labels.present?
= render partial: 'shared/label', subject: @project, collection: @prioritized_labels, as: :label = render partial: 'shared/label', subject: @project, collection: @prioritized_labels, as: :label
......
...@@ -15,16 +15,16 @@ ...@@ -15,16 +15,16 @@
%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' } %button.label-action.add-priority.btn.btn-transparent.has-tooltip{ title: 'Prioritize', type: 'button', :'data-placement' => 'top' }
= icon('star-o') = sprite_icon('star-o')
%button.label-action.remove-priority.btn.btn-transparent.has-tooltip{ title: 'Remove priority', type: 'button', :'data-placement' => 'top' } %button.label-action.remove-priority.btn.btn-transparent.has-tooltip{ title: 'Remove priority', type: 'button', :'data-placement' => 'top' }
= icon('star') = sprite_icon('star')
%li.inline %li.inline
= link_to edit_label_path(label), class: 'btn btn-transparent label-action' do = link_to edit_label_path(label), class: 'btn btn-transparent label-action' do
= icon('pencil') = sprite_icon('pencil')
%li.inline %li.inline
.dropdown .dropdown
%button{ type: 'button', class: 'btn btn-transparent js-label-options-dropdown label-action', data: { toggle: 'dropdown' } } %button{ type: 'button', class: 'btn btn-transparent js-label-options-dropdown label-action', data: { toggle: 'dropdown' } }
= custom_icon('ellipsis_v') = sprite_icon('ellipsis_v')
.dropdown-menu.dropdown-menu-align-right .dropdown-menu.dropdown-menu-align-right
%ul %ul
- if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group) - if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group)
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
%button.label-subscribe-button.btn.btn-default{ data: { toggle: 'dropdown' } } %button.label-subscribe-button.btn.btn-default{ data: { toggle: 'dropdown' } }
%span %span
Subscribe Subscribe
= icon('chevron-down') = sprite_icon('chevron-down')
.dropdown-menu.dropdown-menu-align-right .dropdown-menu.dropdown-menu-align-right
%ul %ul
%li %li
......
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