Commit 71bea374 authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch '283895-fix-pipeline-mr-widget-alignment' into 'master'

Fix alignment issues for pipelines in the MR widget.

See merge request gitlab-org/gitlab!65351
parents 7db9f4c6 27b7fca5
...@@ -14,27 +14,25 @@ export default { ...@@ -14,27 +14,25 @@ export default {
}; };
</script> </script>
<template> <template>
<table class="table m-0"> <div class="gl-pl-7">
<thead class="thead-white text-nowrap"> <table class="table m-0">
<tr class="d-none d-sm-table-row"> <thead class="thead-white text-nowrap">
<th class="w-0"></th> <tr class="d-none d-sm-table-row">
<th>{{ __('Artifact') }}</th> <th>{{ __('Artifact') }}</th>
<th class="w-50"></th> <th>{{ __('Job') }}</th>
<th>{{ __('Job') }}</th> </tr>
</tr> </thead>
</thead>
<tbody> <tbody>
<tr v-for="item in artifacts" :key="item.text"> <tr v-for="item in artifacts" :key="item.text">
<td class="w-0"></td> <td>
<td> <gl-link :href="item.url" target="_blank">{{ item.text }}</gl-link>
<gl-link :href="item.url" target="_blank">{{ item.text }}</gl-link> </td>
</td> <td>
<td class="w-0"></td> <gl-link :href="item.job_path">{{ item.job_name }}</gl-link>
<td> </td>
<gl-link :href="item.job_path">{{ item.job_name }}</gl-link> </tr>
</td> </tbody>
</tr> </table>
</tbody> </div>
</table>
</template> </template>
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
<template v-else> <template v-else>
<button <button
class="btn-blank btn s32 square gl-mr-3" class="btn-blank btn s32 square"
type="button" type="button"
:aria-label="ariaLabel" :aria-label="ariaLabel"
:disabled="isLoading" :disabled="isLoading"
......
...@@ -171,7 +171,7 @@ export default { ...@@ -171,7 +171,7 @@ export default {
<template v-else-if="!hasPipeline"> <template v-else-if="!hasPipeline">
<gl-loading-icon size="md" /> <gl-loading-icon size="md" />
<p <p
class="gl-flex-grow-1 gl-display-flex gl-ml-5 gl-mb-0" class="gl-flex-grow-1 gl-display-flex gl-ml-3 gl-mb-0"
data-testid="monitoring-pipeline-message" data-testid="monitoring-pipeline-message"
> >
{{ $options.monitoringPipelineText }} {{ $options.monitoringPipelineText }}
...@@ -190,7 +190,7 @@ export default { ...@@ -190,7 +190,7 @@ export default {
</p> </p>
</template> </template>
<template v-else-if="hasPipeline"> <template v-else-if="hasPipeline">
<a :href="status.details_path" class="align-self-start gl-mr-3"> <a :href="status.details_path" class="gl-align-self-center gl-mr-3">
<ci-icon :status="status" :size="24" /> <ci-icon :status="status" :size="24" />
</a> </a>
<div class="ci-widget-container d-flex"> <div class="ci-widget-container d-flex">
......
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