summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jvargas@gitlab.com>2018-06-04 13:30:21 -0500
committerJose <jvargas@gitlab.com>2018-06-04 13:30:21 -0500
commit9f9764ee47fe889a2552c534c7840634c7c4729a (patch)
tree65575d9748a372a3fcd695639020352da7674607
parentfe0ebf76c49e2512b211c5d43152275c536f7e3a (diff)
downloadgitlab-ce-jivl-fix-labels-page.tar.gz
Fix labels page missing margins and oversized fontsjivl-fix-labels-page
-rw-r--r--app/assets/stylesheets/pages/labels.scss8
-rw-r--r--app/views/projects/labels/index.html.haml2
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'