diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-27 20:12:30 +0300 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-27 20:12:30 +0300 |
commit | de3db3c491b9781886fc5694fae1fe0fe710b3b4 (patch) | |
tree | 9e8c630679c01d53421ecb3a8beecc49556b5bab /app/assets | |
parent | 883342ce36b5f38156a3376af7d8a2e274163917 (diff) | |
parent | dfafeba0b3ed5d8d3dc1bfc62f307b07c0130b47 (diff) |
Merge branch '28753-align-buttons-environments' into 'master'
Align last column buttons with new environment button
Closes #28753
See merge request !9551
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/environments/components/environment_item.js.es6 | 50 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 4 |
2 files changed, 28 insertions, 26 deletions
diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6 index ad9d1d21a79..5d780bddb0e 100644 --- a/app/assets/javascripts/environments/components/environment_item.js.es6 +++ b/app/assets/javascripts/environments/components/environment_item.js.es6 @@ -503,32 +503,30 @@ module.exports = Vue.component('environment-item', { </span> </td> - <td class="hidden-xs"> - <div v-if="!model.isFolder"> - <div class="btn-group" role="group"> - <actions-component v-if="hasManualActions && canCreateDeployment" - :play-icon-svg="playIconSvg" - :actions="manualActions"> - </actions-component> - - <external-url-component v-if="externalURL && canReadEnvironment" - :external-url="externalURL"> - </external-url-component> - - <stop-component v-if="hasStopAction && canCreateDeployment" - :stop-url="model.stop_path"> - </stop-component> - - <terminal-button-component v-if="model && model.terminal_path" - :terminal-icon-svg="terminalIconSvg" - :terminal-path="model.terminal_path"> - </terminal-button-component> - - <rollback-component v-if="canRetry && canCreateDeployment" - :is-last-deployment="isLastDeployment" - :retry-url="retryUrl"> - </rollback-component> - </div> + <td class="hidden-xs environments-actions"> + <div v-if="!model.isFolder" class="btn-group pull-right" role="group"> + <actions-component v-if="hasManualActions && canCreateDeployment" + :play-icon-svg="playIconSvg" + :actions="manualActions"> + </actions-component> + + <external-url-component v-if="externalURL && canReadEnvironment" + :external-url="externalURL"> + </external-url-component> + + <stop-component v-if="hasStopAction && canCreateDeployment" + :stop-url="model.stop_path"> + </stop-component> + + <terminal-button-component v-if="model && model.terminal_path" + :terminal-icon-svg="terminalIconSvg" + :terminal-path="model.terminal_path"> + </terminal-button-component> + + <rollback-component v-if="canRetry && canCreateDeployment" + :is-last-deployment="isLastDeployment" + :retry-url="retryUrl"> + </rollback-component> </div> </td> </tr> diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 08b3206f31e..f4707f71208 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -128,6 +128,10 @@ padding: 10px 8px; } + td.environments-actions { + padding-right: 0; + } + td.stage-cell { padding: 10px 0; } |