diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-15 15:07:35 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-15 15:07:35 +0000 |
| commit | 2daf7f6236d41ba4da71721aa35b2e40092c9b3f (patch) | |
| tree | 24de09aafb4b6ce50f2f386cdd29370916d11b00 | |
| parent | 4afdfe76d892a5584bc0220c065e802ad604340e (diff) | |
| parent | 564c819b3deec8617f87d59f904c0364b031e05c (diff) | |
| download | gitlab-ce-2daf7f6236d41ba4da71721aa35b2e40092c9b3f.tar.gz | |
Merge branch '47915-badges' into 'master'
Resolve "Long labels names result in overflowing their description block under the Labels page"
Closes #47915
See merge request gitlab-org/gitlab-ce!19868
| -rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 2 | ||||
| -rw-r--r-- | app/views/shared/boards/components/sidebar/_labels.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/labels_hierarchy_spec.rb | 4 |
3 files changed, 4 insertions, 4 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 diff --git a/spec/features/labels_hierarchy_spec.rb b/spec/features/labels_hierarchy_spec.rb index 4700ada1aae..5573148f8bc 100644 --- a/spec/features/labels_hierarchy_spec.rb +++ b/spec/features/labels_hierarchy_spec.rb @@ -34,7 +34,7 @@ feature 'Labels Hierarchy', :js, :nested_groups do wait_for_requests - expect(page).to have_selector('span.badge', text: label.title) + expect(page).to have_selector('.badge', text: label.title) end end @@ -45,7 +45,7 @@ feature 'Labels Hierarchy', :js, :nested_groups do wait_for_requests - expect(page).not_to have_selector('span.badge', text: child_group_label.title) + expect(page).not_to have_selector('.badge', text: child_group_label.title) end end |