Commit 18ad8ce2 authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch '273301-audit-and-update-buttons-on-projects-pipelinescontroller-show' into 'master'

Resolve "Audit and update buttons on Projects::PipelinesController#show"

See merge request gitlab-org/gitlab!84724
parents 9bbc89cd 7e486816
...@@ -249,8 +249,7 @@ export default { ...@@ -249,8 +249,7 @@ export default {
:title="$options.BUTTON_TOOLTIP_RETRY" :title="$options.BUTTON_TOOLTIP_RETRY"
:loading="isRetrying" :loading="isRetrying"
:disabled="isRetrying" :disabled="isRetrying"
category="secondary" variant="confirm"
variant="info"
data-testid="retryPipeline" data-testid="retryPipeline"
class="js-retry-button" class="js-retry-button"
@click="retryPipeline()" @click="retryPipeline()"
...@@ -262,7 +261,6 @@ export default { ...@@ -262,7 +261,6 @@ export default {
v-if="canCancelPipeline" v-if="canCancelPipeline"
:loading="isCanceling" :loading="isCanceling"
:disabled="isCanceling" :disabled="isCanceling"
class="gl-ml-3"
variant="danger" variant="danger"
data-testid="cancelPipeline" data-testid="cancelPipeline"
@click="cancelPipeline()" @click="cancelPipeline()"
......
...@@ -117,7 +117,7 @@ export default { ...@@ -117,7 +117,7 @@ export default {
<template> <template>
<header <header
class="page-content-header gl-display-flex gl-min-h-7" class="page-content-header gl-md-display-flex gl-min-h-7"
data-qa-selector="pipeline_header" data-qa-selector="pipeline_header"
data-testid="ci-header-content" data-testid="ci-header-content"
> >
...@@ -163,11 +163,7 @@ export default { ...@@ -163,11 +163,7 @@ export default {
</template> </template>
</section> </section>
<section <section v-if="$slots.default" data-testid="ci-header-action-buttons" class="gl-display-flex">
v-if="$slots.default"
data-testid="ci-header-action-buttons"
class="gl-display-flex gl-mr-3"
>
<slot></slot> <slot></slot>
</section> </section>
<gl-button <gl-button
......
...@@ -20,7 +20,7 @@ module ButtonHelper ...@@ -20,7 +20,7 @@ module ButtonHelper
# #
# See http://clipboardjs.com/#usage # See http://clipboardjs.com/#usage
def clipboard_button(data = {}) def clipboard_button(data = {})
css_class = data[:class] || 'btn-clipboard btn-transparent' css_class = data[:class] || 'btn-clipboard gl-button btn-default-tertiary btn-icon btn-sm'
title = data[:title] || _('Copy') title = data[:title] || _('Copy')
button_text = data[:button_text] || nil button_text = data[:button_text] || nil
hide_tooltip = data[:hide_tooltip] || false hide_tooltip = data[:hide_tooltip] || false
......
...@@ -164,7 +164,7 @@ RSpec.describe ButtonHelper do ...@@ -164,7 +164,7 @@ RSpec.describe ButtonHelper do
context 'with default options' do context 'with default options' do
context 'when no `text` attribute is not provided' do context 'when no `text` attribute is not provided' do
it 'shows copy to clipboard button with default configuration and no text set to copy' do it 'shows copy to clipboard button with default configuration and no text set to copy' do
expect(element.attr('class')).to eq('btn btn-clipboard btn-transparent') expect(element.attr('class')).to eq('btn btn-clipboard gl-button btn-default-tertiary btn-icon btn-sm')
expect(element.attr('type')).to eq('button') expect(element.attr('type')).to eq('button')
expect(element.attr('aria-label')).to eq('Copy') expect(element.attr('aria-label')).to eq('Copy')
expect(element.attr('aria-live')).to eq('polite') expect(element.attr('aria-live')).to eq('polite')
......
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