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

Use cards for label list

Browse source
This commit is contained in:
Luke Bennett 2018-04-18 18:48:19 +01:00
parent d8dd75ca77
commit b14dcfd1d6
No known key found for this signature in database
GPG key ID: A738E9C68D3BF31A
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -143,6 +143,10 @@
cursor: move; cursor: move;
cursor: -webkit-grab; cursor: -webkit-grab;
cursor: -moz-grab; cursor: -moz-grab;
margin-bottom: 5px;
padding: 11px 10px 11px $gl-padding;
border-radius: $border-radius-default;
&:active { &:active {
cursor: -webkit-grabbing; cursor: -webkit-grabbing;
@ -152,6 +156,10 @@
&.sortable-ghost { &.sortable-ghost {
opacity: 0.3; opacity: 0.3;
} }
.prioritized-labels & {
box-shadow: 0 1px 2px $issue-boards-card-shadow;
}
} }
.btn-action { .btn-action {
@ -319,3 +327,9 @@
font-size: $label-font-size; font-size: $label-font-size;
} }
} }
.labels-container {
background-color: $gray-light;
border-radius: $border-radius-default;
padding: $gl-padding $gl-padding-8;
}

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

@ -17,12 +17,12 @@
= link_to new_project_label_path(@project), class: "btn btn-new" do = link_to new_project_label_path(@project), class: "btn btn-new" do
New label New label
.labels .labels-container.prepend-top-5
- if can_admin_label - if can_admin_label
-# Only show it in the first page -# Only show it in the first page
- hide = @available_labels.empty? || (params[:page].present? && params[:page] != '1') - hide = @available_labels.empty? || (params[:page].present? && params[:page] != '1')
.prioritized-labels{ class: ('hide' if hide) } .prioritized-labels{ class: ('hide' if hide) }
%h5 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{ class: "#{'hidden' unless @prioritized_labels.empty?}" }
= render 'shared/empty_states/priority_labels' = render 'shared/empty_states/priority_labels'