fix button alignment on MWPS component
This commit is contained in:
parent
806a68a81f
commit
ea82173045
2 changed files with 18 additions and 6 deletions
|
@ -65,10 +65,12 @@ export default {
|
|||
<div class="mr-widget-body media">
|
||||
<status-icon status="success" />
|
||||
<div class="media-body">
|
||||
<h4>
|
||||
Set by
|
||||
<mr-widget-author :author="mr.setToMWPSBy" />
|
||||
to be merged automatically when the pipeline succeeds
|
||||
<h4 class="flex-container-block">
|
||||
<span class="append-right-10">
|
||||
Set by
|
||||
<mr-widget-author :author="mr.setToMWPSBy" />
|
||||
to be merged automatically when the pipeline succeeds
|
||||
</span>
|
||||
<a
|
||||
v-if="mr.canCancelAutomaticMerge"
|
||||
@click.prevent="cancelAutomaticMerge"
|
||||
|
@ -94,8 +96,13 @@ export default {
|
|||
<p v-if="mr.shouldRemoveSourceBranch">
|
||||
The source branch will be removed
|
||||
</p>
|
||||
<p v-else>
|
||||
The source branch will not be removed
|
||||
<p
|
||||
v-else
|
||||
class="flex-container-block"
|
||||
>
|
||||
<span class="append-right-10">
|
||||
The source branch will not be removed
|
||||
</span>
|
||||
<a
|
||||
v-if="canRemoveSourceBranch"
|
||||
:disabled="isRemovingSourceBranch"
|
||||
|
|
5
changelogs/unreleased/38541-cancel-alignment.yml
Normal file
5
changelogs/unreleased/38541-cancel-alignment.yml
Normal file
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: fix button alignment on MWPS component
|
||||
merge_request:
|
||||
author:
|
||||
type: fixed
|
Loading…
Reference in a new issue