diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-14 12:31:38 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-14 12:31:38 -0500 |
| commit | 9694b9925f75075b96e2ff719a7e01e55e10c39f (patch) | |
| tree | fb899dd0ff1e747a21517d9924184012e35ae059 | |
| parent | 94a08ec1060063e881afccf5187625702839f3ff (diff) | |
| download | gitlab-ce-9694b9925f75075b96e2ff719a7e01e55e10c39f.tar.gz | |
Add margin between buttons if both retry and cancel are present
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 1dc96e440b8..08da4e290dc 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -128,6 +128,12 @@ color: $table-text-gray; } + .cancel-retry-btns { + .btn:not(:first-child) { + margin-left: 8px; + } + } + .dropdown-toggle, .dropdown-menu { color: $table-text-gray; diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index 4ef72ff5d2a..b53a8633937 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -80,9 +80,10 @@ %span Download '#{build.name}' artifacts - if can?(current_user, :update_pipeline, @project) - - 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") - - if pipeline.cancelable? - = link_to cancel_namespace_project_pipeline_path(@project.namespace, @project, pipeline.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do - = icon("remove") + .cancel-retry-btns + - 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") + - if pipeline.cancelable? + = link_to cancel_namespace_project_pipeline_path(@project.namespace, @project, pipeline.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do + = icon("remove") |