Commit de3db3c4 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '28753-align-buttons-environments' into 'master'

Align last column buttons with new environment button

Closes #28753

See merge request !9551
parents 883342ce dfafeba0
...@@ -503,32 +503,30 @@ module.exports = Vue.component('environment-item', { ...@@ -503,32 +503,30 @@ module.exports = Vue.component('environment-item', {
</span> </span>
</td> </td>
<td class="hidden-xs"> <td class="hidden-xs environments-actions">
<div v-if="!model.isFolder"> <div v-if="!model.isFolder" class="btn-group pull-right" role="group">
<div class="btn-group" role="group"> <actions-component v-if="hasManualActions && canCreateDeployment"
<actions-component v-if="hasManualActions && canCreateDeployment" :play-icon-svg="playIconSvg"
:play-icon-svg="playIconSvg" :actions="manualActions">
:actions="manualActions"> </actions-component>
</actions-component>
<external-url-component v-if="externalURL && canReadEnvironment"
<external-url-component v-if="externalURL && canReadEnvironment" :external-url="externalURL">
:external-url="externalURL"> </external-url-component>
</external-url-component>
<stop-component v-if="hasStopAction && canCreateDeployment"
<stop-component v-if="hasStopAction && canCreateDeployment" :stop-url="model.stop_path">
:stop-url="model.stop_path"> </stop-component>
</stop-component>
<terminal-button-component v-if="model && model.terminal_path"
<terminal-button-component v-if="model && model.terminal_path" :terminal-icon-svg="terminalIconSvg"
:terminal-icon-svg="terminalIconSvg" :terminal-path="model.terminal_path">
:terminal-path="model.terminal_path"> </terminal-button-component>
</terminal-button-component>
<rollback-component v-if="canRetry && canCreateDeployment"
<rollback-component v-if="canRetry && canCreateDeployment" :is-last-deployment="isLastDeployment"
:is-last-deployment="isLastDeployment" :retry-url="retryUrl">
:retry-url="retryUrl"> </rollback-component>
</rollback-component>
</div>
</div> </div>
</td> </td>
</tr> </tr>
......
...@@ -128,6 +128,10 @@ ...@@ -128,6 +128,10 @@
padding: 10px 8px; padding: 10px 8px;
} }
td.environments-actions {
padding-right: 0;
}
td.stage-cell { td.stage-cell {
padding: 10px 0; padding: 10px 0;
} }
......
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