diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-15 10:34:28 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-15 10:34:28 +0000 |
| commit | 3b16c735e3e40fe5ff9591ed9abb1ca867063f75 (patch) | |
| tree | c22a62b30cb7a8055a74d413b4989f93013ca5f2 | |
| parent | 44f0b2c4be6cfd476570e9a3771a4c252372f9e4 (diff) | |
| parent | ea821730452df2889cca154d184384d0b5b2d9e1 (diff) | |
| download | gitlab-ce-3b16c735e3e40fe5ff9591ed9abb1ca867063f75.tar.gz | |
Merge branch '38541-cancel-alignment' into 'master'
fix button alignment on MWPS component
Closes #38541
See merge request gitlab-org/gitlab-ce!15835
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js | 19 | ||||
| -rw-r--r-- | changelogs/unreleased/38541-cancel-alignment.yml | 5 |
2 files changed, 18 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" diff --git a/changelogs/unreleased/38541-cancel-alignment.yml b/changelogs/unreleased/38541-cancel-alignment.yml new file mode 100644 index 00000000000..c6d5136dd57 --- /dev/null +++ b/changelogs/unreleased/38541-cancel-alignment.yml @@ -0,0 +1,5 @@ +--- +title: fix button alignment on MWPS component +merge_request: +author: +type: fixed |