Commit 36253cf0 authored by Phil Hughes's avatar Phil Hughes

Merge branch '345205-tidy-up-label-padding-for-epic-related-items' into 'master'

fix: Tidy up spacing around labels on epic related items

See merge request gitlab-org/gitlab!76216
parents 784f240a 4d4e0e00
...@@ -243,9 +243,9 @@ export default { ...@@ -243,9 +243,9 @@ export default {
</div> </div>
<div <div
class="item-meta gl-display-flex gl-flex-wrap mt-xl-0 gl-align-items-center gl-py-2 gl-ml-6" class="item-meta gl-display-flex gl-flex-wrap mt-xl-0 gl-align-items-center gl-pt-2 gl-ml-6"
> >
<span class="gl-mr-5">{{ itemHierarchy }}</span> <span class="gl-mr-5 gl-mb-3">{{ itemHierarchy }}</span>
<gl-tooltip v-if="isEpic" :target="() => $refs.countBadge"> <gl-tooltip v-if="isEpic" :target="() => $refs.countBadge">
<p v-if="allowSubEpics" class="gl-font-weight-bold gl-m-0"> <p v-if="allowSubEpics" class="gl-font-weight-bold gl-m-0">
{{ __('Epics') }} &#8226; {{ __('Epics') }} &#8226;
...@@ -278,12 +278,12 @@ export default { ...@@ -278,12 +278,12 @@ export default {
> >
<span <span
v-if="allowSubEpics" v-if="allowSubEpics"
class="gl-display-inline-flex gl-align-items-center gl-mr-5" class="gl-display-inline-flex gl-align-items-center gl-mr-5 gl-mb-3"
> >
<gl-icon name="epic" class="gl-mr-2" /> <gl-icon name="epic" class="gl-mr-2" />
{{ totalEpicsCount }} {{ totalEpicsCount }}
</span> </span>
<span class="gl-display-inline-flex gl-align-items-center gl-mr-5"> <span class="gl-display-inline-flex gl-align-items-center gl-mr-5 gl-mb-3">
<gl-icon name="issues" class="gl-mr-2" /> <gl-icon name="issues" class="gl-mr-2" />
{{ totalIssuesCount }} {{ totalIssuesCount }}
</span> </span>
...@@ -292,7 +292,7 @@ export default { ...@@ -292,7 +292,7 @@ export default {
<item-milestone <item-milestone
v-if="hasMilestone" v-if="hasMilestone"
:milestone="item.milestone" :milestone="item.milestone"
class="item-milestone gl-display-flex gl-align-items-center gl-mr-5" class="item-milestone gl-display-flex gl-align-items-center gl-mr-5 gl-mb-3"
/> />
<item-due-date <item-due-date
...@@ -300,13 +300,13 @@ export default { ...@@ -300,13 +300,13 @@ export default {
:date="item.dueDate" :date="item.dueDate"
:closed="Boolean(item.closedAt)" :closed="Boolean(item.closedAt)"
tooltip-placement="top" tooltip-placement="top"
css-class="item-due-date gl-display-flex gl-align-items-center gl-mr-5!" css-class="item-due-date gl-display-flex gl-align-items-center gl-mr-5! gl-mb-3"
/> />
<item-weight <item-weight
v-if="hasWeight" v-if="hasWeight"
:weight="item.weight" :weight="item.weight"
class="item-weight gl-display-flex gl-align-items-center gl-mr-5!" class="item-weight gl-display-flex gl-align-items-center gl-mr-5! gl-mb-3"
tag-name="span" tag-name="span"
/> />
...@@ -320,13 +320,13 @@ export default { ...@@ -320,13 +320,13 @@ export default {
v-if="showEpicHealthStatus" v-if="showEpicHealthStatus"
:health-status="item.healthStatus" :health-status="item.healthStatus"
data-testid="epic-health-status" data-testid="epic-health-status"
class="issuable-tag-valign gl-mr-5" class="issuable-tag-valign gl-mr-5 gl-mb-3"
/> />
<issue-health-status <issue-health-status
v-if="showIssueHealthStatus" v-if="showIssueHealthStatus"
:health-status="item.healthStatus" :health-status="item.healthStatus"
data-testid="issue-health-status" data-testid="issue-health-status"
class="issuable-tag-valign gl-mr-5" class="issuable-tag-valign gl-mr-5 gl-mb-3"
/> />
<template v-if="showLabels"> <template v-if="showLabels">
...@@ -338,7 +338,7 @@ export default { ...@@ -338,7 +338,7 @@ export default {
:scoped="showScopedLabel(label)" :scoped="showScopedLabel(label)"
:target="labelFilterUrl(label)" :target="labelFilterUrl(label)"
:title="label.title" :title="label.title"
class="gl-mr-5 gl-mt-1 gl-mb-1 gl-label-sm" class="gl-mr-3 gl-mb-3 gl-label-sm"
tooltip-placement="top" tooltip-placement="top"
/> />
</template> </template>
......
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