Commit 6a30f85b authored by David O'Regan's avatar David O'Regan

Merge branch 'master' into 'master'

Change button variant from success to confirm

See merge request gitlab-org/gitlab!79617
parents 164d66e0 f6c2539c
...@@ -98,9 +98,6 @@ export default { ...@@ -98,9 +98,6 @@ export default {
return this.$options.i18n[this.currentPage].btnText; return this.$options.i18n[this.currentPage].btnText;
}, },
buttonKind() { buttonKind() {
if (this.isNewForm) {
return 'success';
}
if (this.isDeleteForm) { if (this.isDeleteForm) {
return 'danger'; return 'danger';
} }
......
...@@ -110,7 +110,7 @@ describe('BoardForm', () => { ...@@ -110,7 +110,7 @@ describe('BoardForm', () => {
it('passes correct primary action text and variant', () => { it('passes correct primary action text and variant', () => {
expect(findModalActionPrimary().text).toBe('Create board'); expect(findModalActionPrimary().text).toBe('Create board');
expect(findModalActionPrimary().attributes[0].variant).toBe('success'); expect(findModalActionPrimary().attributes[0].variant).toBe('confirm');
}); });
it('does not render delete confirmation message', () => { it('does not render delete confirmation message', () => {
......
...@@ -130,7 +130,7 @@ describe('BoardForm', () => { ...@@ -130,7 +130,7 @@ describe('BoardForm', () => {
it('passes correct primary action text and variant', () => { it('passes correct primary action text and variant', () => {
expect(findModalActionPrimary().text).toBe('Create board'); expect(findModalActionPrimary().text).toBe('Create board');
expect(findModalActionPrimary().attributes[0].variant).toBe('success'); expect(findModalActionPrimary().attributes[0].variant).toBe('confirm');
}); });
it('does not render delete confirmation message', () => { it('does not render delete confirmation message', () => {
......
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