diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-07 04:02:45 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-07 04:02:45 +0000 |
| commit | 760b12dc6b3a927c918855e2ee85a1c0e6bddb73 (patch) | |
| tree | 93d8b59116ff43eead81caffae1c740e4b8f96b1 | |
| parent | 63666a6f94c240bd02160a99a99d9d4e950ae303 (diff) | |
| parent | b8bc25d9160fb3d0091bbe2b4a744f6558907ddd (diff) | |
| download | gitlab-ce-760b12dc6b3a927c918855e2ee85a1c0e6bddb73.tar.gz | |
Merge branch 'revert-e264046c' into 'master'
Revert "Merge branch 'jivl-fix-labels-page' into 'master'"
See merge request gitlab-org/gitlab-ce!19454
| -rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 8 | ||||
| -rw-r--r-- | app/views/projects/labels/index.html.haml | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index 25f011a534b..e178371d21f 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -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; } diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml index 1f183c274be..9c78bade254 100644 --- a/app/views/projects/labels/index.html.haml +++ b/app/views/projects/labels/index.html.haml @@ -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' |