diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-16 15:09:05 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-16 15:09:05 +0300 |
commit | 127e6d9610b96f470ef4da2f7b5936211974fd17 (patch) | |
tree | fa2139329a72d7b8c12eb36f4a6350d3964ec146 /app/assets/javascripts/vue_shared | |
parent | 14cb5b3d793c1f41c7d36e2e899d3e5e9eca148f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue index 494df2d7a37..7e82d8f3f9c 100644 --- a/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue +++ b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue @@ -1,10 +1,11 @@ <script> -import { GlLoadingIcon } from '@gitlab/ui'; +import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; import { __ } from '~/locale'; export default { components: { GlLoadingIcon, + GlIcon, }, props: { isDisabled: { @@ -39,8 +40,10 @@ export default { <slot v-if="$slots.default"></slot> <span v-else class="dropdown-toggle-text"> {{ toggleText }} </span> </template> - <span v-show="!isLoading" class="dropdown-toggle-icon"> - <i class="fa fa-chevron-down" aria-hidden="true" data-hidden="true"></i> - </span> + <gl-icon + v-show="!isLoading" + class="gl-absolute gl-top-3 gl-right-3 gl-text-gray-500" + name="chevron-down" + /> </button> </template> |