Commit 4f59fcd2 authored by Frédéric Caplette's avatar Frédéric Caplette

Merge branch '241595-audit-link-button-in-approvals-footer' into 'master'

Resolve "Audit usage of link variant in ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_footer.vue"

See merge request gitlab-org/gitlab!82407
parents 68705d1d 0edd1765
...@@ -68,11 +68,9 @@ export default { ...@@ -68,11 +68,9 @@ export default {
<template> <template>
<div> <div>
<div class="mr-widget-extension d-flex align-items-center pl-3 gl-py-3"> <div class="mr-widget-extension d-flex align-items-center pl-3 gl-py-3">
<!-- TODO: simplify button classes once https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1029 is completed -->
<gl-button <gl-button
class="gl-mr-3" class="gl-mr-3"
size="small" size="small"
:class="{ 'gl-shadow-none!': shouldShowLoadingSpinner }"
:aria-label="ariaLabel" :aria-label="ariaLabel"
:loading="shouldShowLoadingSpinner" :loading="shouldShowLoadingSpinner"
:icon="angleIcon" :icon="angleIcon"
...@@ -81,14 +79,24 @@ export default { ...@@ -81,14 +79,24 @@ export default {
/> />
<template v-if="isCollapsed"> <template v-if="isCollapsed">
<user-avatar-list :items="suggestedApproversTrimmed" :breakpoint="0" empty-text="" /> <user-avatar-list :items="suggestedApproversTrimmed" :breakpoint="0" empty-text="" />
<gl-button data-testid="approvers-expand-button" variant="link" @click="toggle">{{ <gl-button
__('View eligible approvers') data-testid="approvers-expand-button"
}}</gl-button> category="tertiary"
variant="confirm"
size="small"
@click="toggle"
>{{ __('View eligible approvers') }}</gl-button
>
</template> </template>
<template v-else> <template v-else>
<gl-button data-testid="approvers-collapse-button" variant="link" @click="toggle">{{ <gl-button
__('Collapse') data-testid="approvers-collapse-button"
}}</gl-button> category="tertiary"
variant="confirm"
size="small"
@click="toggle"
>{{ __('Collapse') }}</gl-button
>
</template> </template>
</div> </div>
<div v-if="!isCollapsed && approvalRules.length" class="border-top"> <div v-if="!isCollapsed && approvalRules.length" class="border-top">
......
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