diff options
author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-04 21:42:01 +0000 |
---|---|---|
committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-06-05 11:55:17 +0200 |
commit | 632d65d0d2c0a80a1a747fa190b37e1c3a9ffa3b (patch) | |
tree | 3ef6b8d3d29a1b87cac464af683b5f5a8a42bba5 | |
parent | 43c1fd36490bf627c8e0d9e40637a35f8e680579 (diff) | |
download | gitlab-ce-632d65d0d2c0a80a1a747fa190b37e1c3a9ffa3b.tar.gz |
Merge branch 'jivl-fix-labels-page' into 'master'
Fix labels page missing margins and oversized fonts
Closes #46706
See merge request gitlab-org/gitlab-ce!19383
-rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 8 | ||||
-rw-r--r-- | app/views/projects/labels/index.html.haml | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index e178371d21f..25f011a534b 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -196,6 +196,10 @@ .prioritized-labels { margin-bottom: 30px; + h5 { + font-size: $gl-font-size; + } + .add-priority { display: none; color: $gray-light; @@ -210,6 +214,10 @@ } .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 9c78bade254..1f183c274be 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 Prioritized Labels + %h5.prepend-top-10 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' |