diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-17 13:07:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-17 13:07:47 +0300 |
commit | d670c3006e6e44901bce0d53cc4768d1d80ffa92 (patch) | |
tree | 8f65743c232e5b76850c4cc264ba15e1185815ff /app/assets/javascripts/vue_merge_request_widget/components | |
parent | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-ee
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components')
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue index b25c0cc0d96..bdd46d6a656 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue @@ -71,7 +71,7 @@ export default { :aria-label="buttonTitle" :loading="isLoading" :disabled="isActionInProgress" - :class="`inline gl-ml-2 ${containerClasses}`" + :class="`inline gl-ml-3 ${containerClasses}`" :icon="icon" @click="$emit('click')" > diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue index 671f9cb8e74..7e587663c26 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue @@ -151,7 +151,7 @@ export default { </script> <template> - <div> + <div class="gl-display-inline-flex"> <deployment-action-button v-if="canBeManuallyDeployed" :action-in-progress="actionInProgress" diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue index a5d165ebd49..459bee8023f 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue @@ -71,13 +71,13 @@ export default { }; </script> <template> - <span> + <span class="gl-display-inline-flex"> <gl-button-group v-if="shouldRenderDropdown" size="small"> <review-app-link :display="appButtonText" :link="deploymentExternalUrl" size="small" - css-class="deploy-link js-deploy-url inline" + css-class="deploy-link js-deploy-url inline gl-ml-3" /> <gl-dropdown toggle-class="gl-px-2!" size="small" class="js-mr-wigdet-deployment-dropdown"> <template #button-content> @@ -112,7 +112,7 @@ export default { :display="appButtonText" :link="deploymentExternalUrl" size="small" - css-class="js-deploy-url deploy-link btn btn-default btn-sm inline" + css-class="js-deploy-url deploy-link btn btn-default btn-sm inline gl-ml-3" /> <visual-review-app-link v-if="showVisualReviewApp" |