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
This commit is contained in:
commit
2daf7f6236
|
@ -280,7 +280,7 @@
|
||||||
width: 150px;
|
width: 150px;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
|
|
||||||
.label {
|
.badge {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
None
|
None
|
||||||
%a{ href: "#",
|
%a{ href: "#",
|
||||||
"v-for" => "label in issue.labels" }
|
"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 }}
|
{{ label.title }}
|
||||||
- if can_admin_issue?
|
- if can_admin_issue?
|
||||||
.selectbox
|
.selectbox
|
||||||
|
|
|
@ -34,7 +34,7 @@ feature 'Labels Hierarchy', :js, :nested_groups do
|
||||||
|
|
||||||
wait_for_requests
|
wait_for_requests
|
||||||
|
|
||||||
expect(page).to have_selector('span.badge', text: label.title)
|
expect(page).to have_selector('.badge', text: label.title)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ feature 'Labels Hierarchy', :js, :nested_groups do
|
||||||
|
|
||||||
wait_for_requests
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue