kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

UX review changes

Browse source
This commit is contained in:
Luke Bennett 2018-05-08 20:53:40 +01:00
parent c792501440
commit 892717452c
No known key found for this signature in database
GPG key ID: A738E9C68D3BF31A
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/pages/labels.scss
View file

@ -234,9 +234,10 @@
.label-badge {
color: $theme-gray-900;
font-weight: $gl-font-weight-bold;
padding: $gl-padding-4;
font-weight: $gl-font-weight-normal;
padding: $gl-padding-4 $gl-padding-8;
border-radius: $border-radius-default;
font-size: $label-font-size;
}
.label-badge-blue {
@ -313,3 +314,7 @@
}
}
}
.priority-labels-empty-state .svg-content img {
max-width: 114px;
}

2
app/views/groups/labels/index.html.haml
View file

@ -25,7 +25,7 @@
.prioritized-labels{ class: ('hide' if hide) }
%h5.prepend-top-0 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'
- if @prioritized_labels.present?
= render partial: 'shared/label', subject: @group, collection: @prioritized_labels, as: :label

2
app/views/projects/labels/index.html.haml
View file

@ -25,7 +25,7 @@
.prioritized-labels{ class: ('hide' if hide) }
%h5.prepend-top-0 Prioritized Labels
%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'
- if @prioritized_labels.present?
= render partial: 'shared/label', subject: @project, collection: @prioritized_labels, as: :label

10
app/views/shared/_label.html.haml
View file

@ -15,16 +15,16 @@
%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' }
= 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' }
= icon('star')
= sprite_icon('star')
%li.inline
= link_to edit_label_path(label), class: 'btn btn-transparent label-action' do
= icon('pencil')
= sprite_icon('pencil')
%li.inline
.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
%ul
- if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group)
@ -50,7 +50,7 @@
%button.label-subscribe-button.btn.btn-default{ data: { toggle: 'dropdown' } }
%span
Subscribe
= icon('chevron-down')
= sprite_icon('chevron-down')
.dropdown-menu.dropdown-menu-align-right
%ul
%li