diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-15 09:09:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-15 09:09:14 +0300 |
commit | 2819fd258a456f0193a2e1ca9e7a54cee45b98cf (patch) | |
tree | 0b96dc430b53a943937617888cf56874069ccde0 /app/assets/javascripts/vue_shared/components/actions_button.vue | |
parent | 5ec2d1e9474e86064d5764bc991252dd1a370895 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/actions_button.vue')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/actions_button.vue | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/app/assets/javascripts/vue_shared/components/actions_button.vue b/app/assets/javascripts/vue_shared/components/actions_button.vue index f333ab49ead..9b21de19185 100644 --- a/app/assets/javascripts/vue_shared/components/actions_button.vue +++ b/app/assets/javascripts/vue_shared/components/actions_button.vue @@ -3,7 +3,7 @@ import { GlDropdown, GlDropdownItem, GlDropdownDivider, - GlLink, + GlButton, GlTooltipDirective, } from '@gitlab/ui'; @@ -12,7 +12,7 @@ export default { GlDropdown, GlDropdownItem, GlDropdownDivider, - GlLink, + GlButton, }, directives: { GlTooltip: GlTooltipDirective, @@ -27,6 +27,16 @@ export default { required: false, default: '', }, + category: { + type: String, + required: false, + default: 'secondary', + }, + variant: { + type: String, + required: false, + default: 'default', + }, }, computed: { hasMultipleActions() { @@ -54,6 +64,8 @@ export default { class="gl-button-deprecated-adapter" :text="selectedAction.text" :split-href="selectedAction.href" + :variant="variant" + :category="category" split @click="handleClick(selectedAction, $event)" > @@ -77,14 +89,15 @@ export default { <gl-dropdown-divider v-if="index != actions.length - 1" :key="action.key + '_divider'" /> </template> </gl-dropdown> - <gl-link + <gl-button v-else-if="selectedAction" v-gl-tooltip="selectedAction.tooltip" v-bind="selectedAction.attrs" - class="btn" + :variant="variant" + :category="category" :href="selectedAction.href" @click="handleClick(selectedAction, $event)" > {{ selectedAction.text }} - </gl-link> + </gl-button> </template> |