diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-24 12:09:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-24 12:09:43 +0300 |
| commit | 028c7bdc315c3770f2ccc86f1100d90a5f702cad (patch) | |
| tree | ee46807784d115a6bc4ffedbbd94588025e80b01 /app/assets/javascripts/sidebar | |
| parent | d1727df7469dacdf782140d69e5cf3aa08d75ec9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
3 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/label_item.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/label_item.vue index 2960298dca8..9df03a4d7f8 100644 --- a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/label_item.vue +++ b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/label_item.vue @@ -31,7 +31,7 @@ export default { const { label, highlight, isLabelSet, isLabelIndeterminate } = props; const labelColorBox = h('span', { - class: 'dropdown-label-box gl-flex-shrink-0 gl-top-0 gl-absolute', + class: 'dropdown-label-box gl-mr-2', style: { backgroundColor: label.color, }, diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_labels_view.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_labels_view.vue index e664d6b4bd6..dce80af8a5e 100644 --- a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_labels_view.vue +++ b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents_labels_view.vue @@ -154,7 +154,6 @@ export default { v-for="(label, index) in visibleLabels" :key="label.id" :is-checked="isLabelSelected(label)" - is-check-centered is-check-item :active="shouldHighlightFirstItem && index === 0" active-class="is-focused" diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/label_item.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/label_item.vue index 19024692bdf..4ce2644262a 100644 --- a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/label_item.vue +++ b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/label_item.vue @@ -10,9 +10,9 @@ export default { </script> <template> - <div class="gl-display-flex gl-align-items-center gl-word-break-word gl-relative gl-pl-4"> + <div class="gl-display-flex gl-word-break-word"> <span - class="dropdown-label-box gl-flex-shrink-0 gl-top-0 gl-absolute" + class="dropdown-label-box gl-flex-shrink-0 gl-top-0 gl-mr-3" :style="{ 'background-color': label.color }" data-testid="label-color-box" ></span> |