diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-17 13:56:27 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-17 13:56:27 -0700 |
| commit | abe35457ee6ef7e13cf9f67a8bd0b9bbc380dfe7 (patch) | |
| tree | 2fe14dcce14378b079cb1a980247ee5652a3a8bd | |
| parent | 4ce2ca4d36c402c533519c25c61cbb4eac92e719 (diff) | |
| download | gitlab-ce-pipelines-page-redesign.tar.gz | |
Create global secondary inverted buttonpipelines-page-redesign
| -rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/builds/_header.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/pipelines/_info.html.haml | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index f7d681535dc..ed493278b36 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -345,8 +345,10 @@ } } -.retry-build-btn { - @include btn-outline($white-light, $blue-normal, $blue-normal, $blue-light, $white-light, $blue-light); +.btn-inverted { + &-secondary { + @include btn-outline($white-light, $blue-normal, $blue-normal, $blue-light, $white-light, $blue-light); + } } @media (max-width: $screen-xs-max) { diff --git a/app/views/projects/builds/_header.html.haml b/app/views/projects/builds/_header.html.haml index fea7b975df5..b3ee55fca0b 100644 --- a/app/views/projects/builds/_header.html.haml +++ b/app/views/projects/builds/_header.html.haml @@ -14,6 +14,6 @@ = render "user" = time_ago_with_tooltip(@build.created_at) - if can?(current_user, :update_build, @build) && @build.retryable? - = link_to "Retry build", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'btn retry-build-btn pull-right', method: :post + = link_to "Retry build", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'btn btn-inverted-secondary pull-right', method: :post %button.btn.btn-default.pull-right.visible-xs-block.visible-sm-block.build-gutter-toggle.js-sidebar-build-toggle{ role: "button", type: "button" } = icon('angle-double-left') diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index decbbd80ac5..a0de125d765 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -10,7 +10,7 @@ .header-action-buttons - if can?(current_user, :update_pipeline, @pipeline.project) - if @pipeline.builds.latest.failed.any?(&:retryable?) - = link_to "Retry failed", retry_namespace_project_pipeline_path(@pipeline.project.namespace, @pipeline.project, @pipeline.id), class: 'btn retry-build-btn', method: :post + = link_to "Retry failed", retry_namespace_project_pipeline_path(@pipeline.project.namespace, @pipeline.project, @pipeline.id), class: 'btn btn-inverted-secondary', method: :post - if @pipeline.builds.running_or_pending.any? = link_to "Cancel running", cancel_namespace_project_pipeline_path(@pipeline.project.namespace, @pipeline.project, @pipeline.id), data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post |