summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-06-14 11:23:00 -0700
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-06-14 11:23:00 -0700
commit279744f057f3bbe4e4e5c7e59e9b7693c3c88f65 (patch)
treedb080c5329a3f97f840968979229c9206320cd5d
parentedfa2e3fb673412272e8bc9cdbfa2e3a86a9f21f (diff)
downloadgitlab-ce-279744f057f3bbe4e4e5c7e59e9b7693c3c88f65.tar.gz
Truncate long label names47915-badges
-rw-r--r--app/assets/stylesheets/pages/labels.scss2
-rw-r--r--app/views/shared/boards/components/sidebar/_labels.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 73eb399d7bb..79cac7f4ff0 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -280,7 +280,7 @@
width: 150px;
flex-shrink: 0;
- .label {
+ .badge {
overflow: hidden;
text-overflow: ellipsis;
max-width: 100%;
diff --git a/app/views/shared/boards/components/sidebar/_labels.html.haml b/app/views/shared/boards/components/sidebar/_labels.html.haml
index a112a9f1f7e..daee691e358 100644
--- a/app/views/shared/boards/components/sidebar/_labels.html.haml
+++ b/app/views/shared/boards/components/sidebar/_labels.html.haml
@@ -9,7 +9,7 @@
None
%a{ href: "#",
"v-for" => "label in issue.labels" }
- %span.badge.color-label.has-tooltip{ ":style" => "{ backgroundColor: label.color, color: label.textColor }" }
+ .badge.color-label.has-tooltip{ ":style" => "{ backgroundColor: label.color, color: label.textColor }" }
{{ label.title }}
- if can_admin_issue?
.selectbox