Commit fa583110 authored by Miguel Rincon's avatar Miguel Rincon

Merge branch 'yo-add-btn-default-ci' into 'master'

Add btn-default class for btn-build buttons

See merge request gitlab-org/gitlab!52093
parents 17d92bcb 365cd93c
...@@ -81,7 +81,7 @@ export default { ...@@ -81,7 +81,7 @@ export default {
v-gl-tooltip v-gl-tooltip
type="button" type="button"
:disabled="isLoading" :disabled="isLoading"
class="dropdown-new btn btn-default js-pipeline-dropdown-manual-actions" class="dropdown-new gl-button btn btn-default js-pipeline-dropdown-manual-actions"
:title="__('Run manual or delayed jobs')" :title="__('Run manual or delayed jobs')"
data-toggle="dropdown" data-toggle="dropdown"
:aria-label="__('Run manual or delayed jobs')" :aria-label="__('Run manual or delayed jobs')"
......
...@@ -50,10 +50,10 @@ ...@@ -50,10 +50,10 @@
.table-action-buttons .table-action-buttons
.btn-group .btn-group
- if can?(current_user, :read_build, @project) - if can?(current_user, :read_build, @project)
= link_to download_project_job_artifacts_path(@project, artifact.job), rel: 'nofollow', download: '', title: _('Download artifacts'), data: { placement: 'top', container: 'body' }, ref: 'tooltip', aria: { label: _('Download artifacts') }, class: 'gl-button btn btn-build has-tooltip ml-0' do = link_to download_project_job_artifacts_path(@project, artifact.job), rel: 'nofollow', download: '', title: _('Download artifacts'), data: { placement: 'top', container: 'body' }, ref: 'tooltip', aria: { label: _('Download artifacts') }, class: 'gl-button btn btn-default btn-build has-tooltip ml-0' do
= sprite_icon('download') = sprite_icon('download')
= link_to browse_project_job_artifacts_path(@project, artifact.job), rel: 'nofollow', title: _('Browse artifacts'), data: { placement: 'top', container: 'body' }, ref: 'tooltip', aria: { label: _('Browse artifacts') }, class: 'gl-button btn btn-build has-tooltip' do = link_to browse_project_job_artifacts_path(@project, artifact.job), rel: 'nofollow', title: _('Browse artifacts'), data: { placement: 'top', container: 'body' }, ref: 'tooltip', aria: { label: _('Browse artifacts') }, class: 'gl-button btn btn-default btn-build has-tooltip' do
= sprite_icon('folder-open') = sprite_icon('folder-open')
- if can?(current_user, :destroy_artifacts, @project) - if can?(current_user, :destroy_artifacts, @project)
......
...@@ -99,11 +99,11 @@ ...@@ -99,11 +99,11 @@
%td %td
.gl-display-flex .gl-display-flex
- if can?(current_user, :read_job_artifacts, job) && job.artifacts? - if can?(current_user, :read_job_artifacts, job) && job.artifacts?
= link_to download_project_job_artifacts_path(job.project, job), rel: 'nofollow', download: '', title: _('Download artifacts'), class: 'btn btn-build gl-button btn-icon btn-svg' do = link_to download_project_job_artifacts_path(job.project, job), rel: 'nofollow', download: '', title: _('Download artifacts'), class: 'btn btn-build btn-default gl-button btn-icon btn-svg' do
= sprite_icon('download') = sprite_icon('download')
- if can?(current_user, :update_build, job) - if can?(current_user, :update_build, job)
- if job.active? - if job.active?
= link_to cancel_project_job_path(job.project, job, continue: { to: request.fullpath }), method: :post, title: _('Cancel'), class: 'btn gl-button btn-build' do = link_to cancel_project_job_path(job.project, job, continue: { to: request.fullpath }), method: :post, title: _('Cancel'), class: 'btn gl-button btn-build btn-default' do
= sprite_icon('close') = sprite_icon('close')
- elsif job.scheduled? - elsif job.scheduled?
.btn-group .btn-group
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
= sprite_icon('time-out') = sprite_icon('time-out')
- elsif allow_retry - elsif allow_retry
- if job.playable? && !admin && can?(current_user, :update_build, job) - if job.playable? && !admin && can?(current_user, :update_build, job)
= link_to play_project_job_path(job.project, job, return_to: request.original_url), method: :post, title: _('Play'), class: 'btn gl-button btn-build' do = link_to play_project_job_path(job.project, job, return_to: request.original_url), method: :post, title: _('Play'), class: 'btn gl-button btn-build btn-default' do
= custom_icon('icon_play') = custom_icon('icon_play')
- elsif job.retryable? - elsif job.retryable?
= link_to retry_project_job_path(job.project, job, return_to: request.original_url), method: :post, title: _('Retry'), class: 'btn btn-build gl-button btn-icon btn-default' do = link_to retry_project_job_path(job.project, job, return_to: request.original_url), method: :post, title: _('Retry'), class: 'btn btn-build gl-button btn-icon btn-default' do
......
---
title: Add btn-default class for btn-build buttons
merge_request: 52093
author: Yogi (@yo)
type: other
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