Commit 838f9a61 authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch '246774-registry-list-spacing-between-left-and-right-is-inconsistent' into 'master'

Fix registry list item vertical spacing

See merge request gitlab-org/gitlab!41780
parents 9ac5d7ac 2c4da8de
...@@ -116,13 +116,15 @@ export default { ...@@ -116,13 +116,15 @@ export default {
</template> </template>
<template #right-secondary> <template #right-secondary>
<gl-sprintf :message="__('Created %{timestamp}')"> <span>
<template #timestamp> <gl-sprintf :message="__('Created %{timestamp}')">
<span v-gl-tooltip :title="tooltipTitle(packageEntity.created_at)"> <template #timestamp>
{{ timeFormatted(packageEntity.created_at) }} <span v-gl-tooltip :title="tooltipTitle(packageEntity.created_at)">
</span> {{ timeFormatted(packageEntity.created_at) }}
</template> </span>
</gl-sprintf> </template>
</gl-sprintf>
</span>
</template> </template>
<template v-if="!disableDelete" #right-action> <template v-if="!disableDelete" #right-action>
......
...@@ -36,7 +36,7 @@ export default { ...@@ -36,7 +36,7 @@ export default {
</script> </script>
<template> <template>
<div class="gl-display-flex gl-align-items-center gl-mb-2"> <div class="gl-display-flex gl-align-items-center">
<template v-if="hasPipeline"> <template v-if="hasPipeline">
<gl-icon name="git-merge" class="gl-mr-2" /> <gl-icon name="git-merge" class="gl-mr-2" />
<span data-testid="pipeline-ref" class="gl-mr-2">{{ packageEntity.pipeline.ref }}</span> <span data-testid="pipeline-ref" class="gl-mr-2">{{ packageEntity.pipeline.ref }}</span>
......
...@@ -83,7 +83,7 @@ export default { ...@@ -83,7 +83,7 @@ export default {
</div> </div>
<div <div
v-if="$slots['left-secondary']" v-if="$slots['left-secondary']"
class="gl-text-gray-500 gl-mt-1 gl-min-h-6 gl-min-w-0 gl-flex-fill-1" class="gl-display-flex gl-align-items-center gl-text-gray-500 gl-mt-1 gl-min-h-6 gl-min-w-0 gl-flex-fill-1"
> >
<slot name="left-secondary"></slot> <slot name="left-secondary"></slot>
</div> </div>
...@@ -93,11 +93,14 @@ export default { ...@@ -93,11 +93,14 @@ export default {
> >
<div <div
v-if="$slots['right-primary']" v-if="$slots['right-primary']"
class="gl-sm-text-body gl-sm-font-weight-bold gl-min-h-6" class="gl-display-flex gl-align-items-center gl-sm-text-body gl-sm-font-weight-bold gl-min-h-6"
> >
<slot name="right-primary"></slot> <slot name="right-primary"></slot>
</div> </div>
<div v-if="$slots['right-secondary']" class="gl-mt-1 gl-min-h-6"> <div
v-if="$slots['right-secondary']"
class="gl-display-flex gl-align-items-center gl-mt-1 gl-min-h-6"
>
<slot name="right-secondary"></slot> <slot name="right-secondary"></slot>
</div> </div>
</div> </div>
......
...@@ -40,7 +40,7 @@ exports[`packages_list_row renders 1`] = ` ...@@ -40,7 +40,7 @@ exports[`packages_list_row renders 1`] = `
</div> </div>
<div <div
class="gl-text-gray-500 gl-mt-1 gl-min-h-6 gl-min-w-0 gl-flex-fill-1" class="gl-display-flex gl-align-items-center gl-text-gray-500 gl-mt-1 gl-min-h-6 gl-min-w-0 gl-flex-fill-1"
> >
<div <div
class="gl-display-flex" class="gl-display-flex"
...@@ -94,7 +94,7 @@ exports[`packages_list_row renders 1`] = ` ...@@ -94,7 +94,7 @@ exports[`packages_list_row renders 1`] = `
class="gl-display-flex gl-flex-direction-column gl-sm-align-items-flex-end gl-justify-content-space-between gl-text-gray-500 gl-flex-shrink-0" class="gl-display-flex gl-flex-direction-column gl-sm-align-items-flex-end gl-justify-content-space-between gl-text-gray-500 gl-flex-shrink-0"
> >
<div <div
class="gl-sm-text-body gl-sm-font-weight-bold gl-min-h-6" class="gl-display-flex gl-align-items-center gl-sm-text-body gl-sm-font-weight-bold gl-min-h-6"
> >
<publish-method-stub <publish-method-stub
packageentity="[object Object]" packageentity="[object Object]"
...@@ -102,11 +102,13 @@ exports[`packages_list_row renders 1`] = ` ...@@ -102,11 +102,13 @@ exports[`packages_list_row renders 1`] = `
</div> </div>
<div <div
class="gl-mt-1 gl-min-h-6" class="gl-display-flex gl-align-items-center gl-mt-1 gl-min-h-6"
> >
<gl-sprintf-stub <span>
message="Created %{timestamp}" <gl-sprintf-stub
/> message="Created %{timestamp}"
/>
</span>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
exports[`publish_method renders 1`] = ` exports[`publish_method renders 1`] = `
<div <div
class="gl-display-flex gl-align-items-center gl-mb-2" class="gl-display-flex gl-align-items-center"
> >
<gl-icon-stub <gl-icon-stub
class="gl-mr-2" class="gl-mr-2"
......
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