diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-16 17:51:39 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-16 17:51:39 -0500 |
| commit | e72fe97e42c1a97bd6fd305a61e90dbb193c9f45 (patch) | |
| tree | 37baff6f7a9fe2a0d18b52b2890adc41635f2c41 | |
| parent | 1395edc06f0f06e4cfe8b37b49298c739b9eda2e (diff) | |
| download | gitlab-ce-19907-deploy.tar.gz | |
Align cancel and retry buttons19907-deploy
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 08da4e290dc..a0334207c68 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -129,6 +129,8 @@ } .cancel-retry-btns { + vertical-align: middle; + .btn:not(:first-child) { margin-left: 8px; } diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index ebe4204788e..631873fb0a3 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -71,7 +71,7 @@ %span Download '#{build.name}' artifacts - if can?(current_user, :update_pipeline, @project) - .cancel-retry-btns + .cancel-retry-btns.inline - if pipeline.retryable? = link_to retry_namespace_project_pipeline_path(@project.namespace, @project, pipeline.id), class: 'btn has-tooltip', title: "Retry", method: :post do = icon("repeat") |