diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
| commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
| tree | c42be41678c2586d49a75cabce89322082698334 /app/assets/javascripts/badges | |
| parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
| download | gitlab-ce-e8d2c2579383897a1dd7f9debd359abe8ae8373d.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/badges')
| -rw-r--r-- | app/assets/javascripts/badges/components/badge.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/badges/components/badge_form.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/badges/components/badge_list_row.vue | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/badges/components/badge.vue b/app/assets/javascripts/badges/components/badge.vue index 309af368df9..53469ac8999 100644 --- a/app/assets/javascripts/badges/components/badge.vue +++ b/app/assets/javascripts/badges/components/badge.vue @@ -84,7 +84,7 @@ export default { /> </a> - <gl-loading-icon v-show="isLoading" :inline="true" /> + <gl-loading-icon v-show="isLoading" size="sm" :inline="true" /> <div v-show="hasError" class="btn-group"> <div class="btn btn-default btn-sm disabled"> diff --git a/app/assets/javascripts/badges/components/badge_form.vue b/app/assets/javascripts/badges/components/badge_form.vue index 7c4ff830a9d..7e605099655 100644 --- a/app/assets/javascripts/badges/components/badge_form.vue +++ b/app/assets/javascripts/badges/components/badge_form.vue @@ -221,7 +221,7 @@ export default { :link-url="renderedLinkUrl" /> <p v-show="isRendering"> - <gl-loading-icon :inline="true" /> + <gl-loading-icon size="sm" :inline="true" /> </p> <p v-show="!renderedBadge && !isRendering" class="disabled-content"> {{ s__('Badges|No image to preview') }} diff --git a/app/assets/javascripts/badges/components/badge_list_row.vue b/app/assets/javascripts/badges/components/badge_list_row.vue index fda51c98e2c..d8525c15087 100644 --- a/app/assets/javascripts/badges/components/badge_list_row.vue +++ b/app/assets/javascripts/badges/components/badge_list_row.vue @@ -73,7 +73,7 @@ export default { data-testid="delete-badge" @click="updateBadgeInModal(badge)" /> - <gl-loading-icon v-show="badge.isDeleting" :inline="true" /> + <gl-loading-icon v-show="badge.isDeleting" size="sm" :inline="true" /> </div> </div> </div> |