summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2017-12-11 17:23:10 +1100
committerSimon Knox <psimyn@gmail.com>2017-12-11 17:24:06 +1100
commitea821730452df2889cca154d184384d0b5b2d9e1 (patch)
tree0c72050a3c895a033733d0e87fedca74054cc11d /app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js
parent806a68a81f1baeed07c146b1b5d9eb77796c46ba (diff)
downloadgitlab-ce-ea821730452df2889cca154d184384d0b5b2d9e1.tar.gz
fix button alignment on MWPS component38541-cancel-alignment
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js19
1 files changed, 13 insertions, 6 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js
index 05c4a28be88..43b2d238f65 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js
@@ -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"