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

Merge branch 'revert-e264046c' into 'master' 

Revert "Merge branch 'jivl-fix-labels-page' into 'master'"

See merge request gitlab-org/gitlab-ce!19454
This commit is contained in:
Clement Ho 2018-06-07 04:02:45 +00:00
parent 63666a6f94 b8bc25d916
commit 760b12dc6b
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/stylesheets/pages/labels.scss
View File

@ -196,10 +196,6 @@
.prioritized-labels {
margin-bottom: 30px;
h5 {
font-size: $gl-font-size;
}
.add-priority {
display: none;
color: $gray-light;
@ -214,10 +210,6 @@
}
.other-labels {
h5 {
font-size: $gl-font-size;
}
.remove-priority {
display: none;
}

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

@ -22,7 +22,7 @@
-# Only show it in the first page
- hide = @available_labels.empty? || (params[:page].present? && params[:page] != '1')
.prioritized-labels{ class: ('hide' if hide) }
%h5.prepend-top-10 Prioritized Labels
%h5 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?}" }
= render 'shared/empty_states/priority_labels'