Commit 87fa88eb authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch '283908-fix-environments-mr-widget-button-spacing-2' into 'master'

Resolve "Fix environments MR widget button spacing"

See merge request gitlab-org/gitlab!64078
parents d12c7203 520f936f
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
:aria-label="buttonTitle" :aria-label="buttonTitle"
:loading="isLoading" :loading="isLoading"
:disabled="isActionInProgress" :disabled="isActionInProgress"
:class="`inline gl-ml-2 ${containerClasses}`" :class="`inline gl-ml-3 ${containerClasses}`"
:icon="icon" :icon="icon"
@click="$emit('click')" @click="$emit('click')"
> >
......
...@@ -151,7 +151,7 @@ export default { ...@@ -151,7 +151,7 @@ export default {
</script> </script>
<template> <template>
<div> <div class="gl-display-inline-flex">
<deployment-action-button <deployment-action-button
v-if="canBeManuallyDeployed" v-if="canBeManuallyDeployed"
:action-in-progress="actionInProgress" :action-in-progress="actionInProgress"
......
...@@ -71,13 +71,13 @@ export default { ...@@ -71,13 +71,13 @@ export default {
}; };
</script> </script>
<template> <template>
<span> <span class="gl-display-inline-flex">
<gl-button-group v-if="shouldRenderDropdown" size="small"> <gl-button-group v-if="shouldRenderDropdown" size="small">
<review-app-link <review-app-link
:display="appButtonText" :display="appButtonText"
:link="deploymentExternalUrl" :link="deploymentExternalUrl"
size="small" 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"> <gl-dropdown toggle-class="gl-px-2!" size="small" class="js-mr-wigdet-deployment-dropdown">
<template #button-content> <template #button-content>
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
:display="appButtonText" :display="appButtonText"
:link="deploymentExternalUrl" :link="deploymentExternalUrl"
size="small" 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 <visual-review-app-link
v-if="showVisualReviewApp" v-if="showVisualReviewApp"
......
...@@ -153,7 +153,7 @@ export default { ...@@ -153,7 +153,7 @@ export default {
}; };
</script> </script>
<template> <template>
<div class="inline"> <div class="gl-display-inline-flex">
<gl-button <gl-button
v-gl-modal="modalId" v-gl-modal="modalId"
category="secondary" category="secondary"
......
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