Commit b4303d1f authored by Jackie Fraser's avatar Jackie Fraser

Update new delete branch button style variant

parent 14f4b2e5
...@@ -47,12 +47,6 @@ export default { ...@@ -47,12 +47,6 @@ export default {
}, },
}, },
computed: { computed: {
variant() {
if (this.disabled) {
return 'default';
}
return 'danger';
},
title() { title() {
if (this.isProtectedBranch && this.disabled) { if (this.isProtectedBranch && this.disabled) {
return s__('Branches|Only a project maintainer or owner can delete a protected branch'); return s__('Branches|Only a project maintainer or owner can delete a protected branch');
...@@ -83,7 +77,7 @@ export default { ...@@ -83,7 +77,7 @@ export default {
class="js-delete-branch-button" class="js-delete-branch-button"
data-qa-selector="delete_branch_button" data-qa-selector="delete_branch_button"
:disabled="disabled" :disabled="disabled"
:variant="variant" variant="default"
:title="title" :title="title"
:aria-label="title" :aria-label="title"
@click="openModal" @click="openModal"
......
...@@ -34,7 +34,7 @@ describe('Delete branch button', () => { ...@@ -34,7 +34,7 @@ describe('Delete branch button', () => {
expect(findDeleteButton().attributes()).toMatchObject({ expect(findDeleteButton().attributes()).toMatchObject({
title: 'Delete branch', title: 'Delete branch',
variant: 'danger', variant: 'default',
icon: 'remove', icon: 'remove',
}); });
}); });
...@@ -44,7 +44,7 @@ describe('Delete branch button', () => { ...@@ -44,7 +44,7 @@ describe('Delete branch button', () => {
expect(findDeleteButton().attributes()).toMatchObject({ expect(findDeleteButton().attributes()).toMatchObject({
title: 'Delete protected branch', title: 'Delete protected branch',
variant: 'danger', variant: 'default',
icon: 'remove', icon: 'remove',
}); });
}); });
...@@ -78,7 +78,7 @@ describe('Delete branch button', () => { ...@@ -78,7 +78,7 @@ describe('Delete branch button', () => {
expect(findDeleteButton().attributes()).toMatchObject({ expect(findDeleteButton().attributes()).toMatchObject({
title: 'Delete branch', title: 'Delete branch',
variant: 'danger', variant: 'default',
}); });
}); });
......
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