Commit a87fb437 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'fix-mr-issues-list-padding' into 'master'

Fix MR widget alignment

See merge request gitlab-org/gitlab!56768
parents f376fed8 bc18d559
...@@ -66,8 +66,8 @@ export default { ...@@ -66,8 +66,8 @@ export default {
}, },
listClasses() { listClasses() {
return { return {
'gl-pl-7': this.nestedLevel === 1, 'gl-pl-9': this.nestedLevel === 1,
'gl-pl-9': this.nestedLevel === 2, 'gl-pl-11-5': this.nestedLevel === 2,
}; };
}, },
}, },
......
...@@ -88,8 +88,8 @@ export default { ...@@ -88,8 +88,8 @@ export default {
}, },
listClasses() { listClasses() {
return { return {
'gl-pl-7': this.nestedLevel === 1, 'gl-pl-9': this.nestedLevel === 1,
'gl-pl-8': this.nestedLevel === 2, 'gl-pl-11-5': this.nestedLevel === 2,
}; };
}, },
}, },
......
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
if (!this.nestedSummary) { if (!this.nestedSummary) {
return ['gl-px-5']; return ['gl-px-5'];
} }
return ['gl-pl-7', 'gl-pr-5', { 'gl-bg-gray-10': this.statusIcon === ICON_WARNING }]; return ['gl-pl-9', 'gl-pr-5', { 'gl-bg-gray-10': this.statusIcon === ICON_WARNING }];
}, },
statusIconSize() { statusIconSize() {
if (!this.nestedSummary) { if (!this.nestedSummary) {
......
...@@ -24,7 +24,7 @@ export default { ...@@ -24,7 +24,7 @@ export default {
n__( n__(
'Reports|Failed %{count} time in %{base_branch} in the last 14 days', 'Reports|Failed %{count} time in %{base_branch} in the last 14 days',
'Reports|Failed %{count} times in %{base_branch} in the last 14 days', 'Reports|Failed %{count} times in %{base_branch} in the last 14 days',
this.issue.recent_failures.count, this.issue.recent_failures?.count,
), ),
this.issue.recent_failures, this.issue.recent_failures,
); );
...@@ -44,20 +44,20 @@ export default { ...@@ -44,20 +44,20 @@ export default {
<template> <template>
<div class="gl-display-flex gl-mt-2 gl-mb-2"> <div class="gl-display-flex gl-mt-2 gl-mb-2">
<issue-status-icon :status="status" :status-icon-size="24" class="gl-mr-3" /> <issue-status-icon :status="status" :status-icon-size="24" class="gl-mr-3" />
<gl-badge
v-if="showRecentFailures"
variant="warning"
class="gl-mr-2"
data-testid="test-issue-body-recent-failures"
>
{{ recentFailureMessage }}
</gl-badge>
<gl-button <gl-button
button-text-classes="gl-white-space-normal! gl-word-break-all gl-text-left" button-text-classes="gl-white-space-normal! gl-word-break-all gl-text-left"
variant="link" variant="link"
data-testid="test-issue-body-description" data-testid="test-issue-body-description"
@click="openModal({ issue })" @click="openModal({ issue })"
> >
<gl-badge
v-if="showRecentFailures"
variant="warning"
class="gl-mr-2"
data-testid="test-issue-body-recent-failures"
>
{{ recentFailureMessage }}
</gl-badge>
{{ issue.name }} {{ issue.name }}
</gl-button> </gl-button>
</div> </div>
......
---
title: Fix test report merge request widget summary and issues alignment
merge_request: 56768
author:
type: fixed
...@@ -52,7 +52,7 @@ describe('Test issue body', () => { ...@@ -52,7 +52,7 @@ describe('Test issue body', () => {
}); });
it('renders issue name', () => { it('renders issue name', () => {
expect(findDescription().text()).toBe(failedIssue.name); expect(findDescription().text()).toContain(failedIssue.name);
}); });
it('renders failed status icon', () => { it('renders failed status icon', () => {
......
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