summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue23
1 files changed, 10 insertions, 13 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue
index 6475def461a..e435dc56503 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue
@@ -1,12 +1,10 @@
<script>
-import { GlButton, GlLoadingIcon, GlIcon } from '@gitlab/ui';
+import { GlButton } from '@gitlab/ui';
import { __ } from '~/locale';
export default {
components: {
GlButton,
- GlLoadingIcon,
- GlIcon,
},
props: {
title: {
@@ -32,7 +30,7 @@ export default {
computed: {
arrowIconName() {
- return this.isCollapsed ? 'chevron-lg-right' : 'chevron-lg-down';
+ return this.isCollapsed ? 'chevron-right' : 'chevron-down';
},
ariaLabel() {
return this.isCollapsed ? __('Expand') : __('Collapse');
@@ -47,7 +45,7 @@ export default {
</script>
<template>
<div class="mr-widget-extension">
- <div class="d-flex align-items-center pl-3">
+ <div class="d-flex align-items-center pl-3 gl-py-3">
<div v-if="hasError" class="ci-widget media">
<div class="media-body">
<span class="gl-font-sm mr-widget-margin-left gl-line-height-24 js-error-state">
@@ -57,16 +55,15 @@ export default {
</div>
<template v-else>
- <button
- class="btn-blank btn s32 square"
- type="button"
+ <gl-button
+ class="gl-mr-3"
+ size="small"
:aria-label="ariaLabel"
- :disabled="isLoading"
+ :loading="isLoading"
+ :icon="arrowIconName"
+ category="tertiary"
@click="toggleCollapsed"
- >
- <gl-loading-icon v-if="isLoading" size="sm" />
- <gl-icon v-else :name="arrowIconName" class="js-icon" />
- </button>
+ />
<template v-if="isCollapsed">
<slot name="header"></slot>
<gl-button