diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-12 00:07:21 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-12 00:07:21 +0000 |
commit | b53b2fbb6b393f28211fa2c2c5bdb519b6e7bc08 (patch) | |
tree | acde0976d5e2d1df33b922ad3afdeb8fc7db9198 /app/assets/javascripts/vue_merge_request_widget | |
parent | 213f46f188c29e9c442df61530110e172a7e819e (diff) | |
download | gitlab-ce-b53b2fbb6b393f28211fa2c2c5bdb519b6e7bc08.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue | 23 |
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 |