Commit 4851d4e1 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '48771-label-picker-line-break-on-long-label-titles' into 'master'

Resolve "Label picker: Line break on long label titles"

Closes #48771

See merge request gitlab-org/gitlab-ce!30610
parents c11eb0c3 8ba48310
...@@ -311,7 +311,8 @@ export default class LabelsSelect { ...@@ -311,7 +311,8 @@ export default class LabelsSelect {
// We need to identify which items are actually labels // We need to identify which items are actually labels
if (label.id) { if (label.id) {
selectedClass.push('label-item'); const selectedLayoutClasses = ['d-flex', 'flex-row', 'text-break-word'];
selectedClass.push('label-item', ...selectedLayoutClasses);
linkEl.dataset.labelId = label.id; linkEl.dataset.labelId = label.id;
} }
......
...@@ -30,6 +30,10 @@ ...@@ -30,6 +30,10 @@
.dropdown-content { .dropdown-content {
max-height: 135px; max-height: 135px;
} }
.dropdown-label-box {
flex: 0 0 auto;
}
} }
.dropdown-new-label { .dropdown-new-label {
......
---
title: 'Resolve Label picker: Line break on long label titles'
merge_request: 30610
author:
type: fixed
...@@ -381,7 +381,7 @@ describe 'Issues > Labels bulk assignment' do ...@@ -381,7 +381,7 @@ describe 'Issues > Labels bulk assignment' do
if unmark if unmark
items.map do |item| items.map do |item|
# Make sure we are unmarking the item no matter the state it has currently # Make sure we are unmarking the item no matter the state it has currently
click_link item until find('a', text: item)[:class] == 'label-item' click_link item until find('a', text: item)[:class].include? 'label-item'
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment