summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Gray <annabel.m.gray@gmail.com>2018-06-12 18:26:47 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-06-13 16:18:26 +0100
commitaf0bbf70bb9b7ffc088ecb93f66b6593edb16a66 (patch)
tree35c7133b1351f73efd300292636612f166128823
parent70891b79cf576ac22d35e85fac49a3cac31e0d3a (diff)
downloadgitlab-ce-af0bbf70bb9b7ffc088ecb93f66b6593edb16a66.tar.gz
Merge branch 'fix-labels-too-large-from-label-list-redesign' into 'master'
Fix labels too large Closes #47499 and #47762 See merge request gitlab-org/gitlab-ce!19640
-rw-r--r--app/assets/stylesheets/pages/labels.scss6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 3c74c5ed2b4..144e9c16943 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -58,7 +58,7 @@
}
.color-label {
- padding: $gl-padding-4 $grid-size;
+ padding: 0 $grid-size;
line-height: 16px;
border-radius: $label-border-radius;
color: $white-light;
@@ -112,6 +112,10 @@
}
}
}
+
+ .color-label {
+ padding: $gl-padding-4 $grid-size;
+ }
}
.prioritized-labels {