diff options
author | Eric Eastwood <contact@ericeastwood.com> | 2017-06-27 12:38:07 -0500 |
---|---|---|
committer | Eric Eastwood <contact@ericeastwood.com> | 2017-06-27 12:38:39 -0500 |
commit | 236b921bd6d006b007b19437a76cb5d7f034b6b0 (patch) | |
tree | 057cc608bde421d513429db88e763409ad5e0bb7 | |
parent | b7ea3ce467534f185961dd2ad6afc2b5f70b7436 (diff) | |
download | gitlab-ce-backport-inline-loading-icon.tar.gz |
Backport inline loading_icon updates from EEbackport-inline-loading-icon
See
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2246#note_33577729
-rw-r--r-- | app/assets/javascripts/vue_shared/components/loading_icon.vue | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/loading_icon.vue b/app/assets/javascripts/vue_shared/components/loading_icon.vue index 41b1d0165b0..15581d5c2a0 100644 --- a/app/assets/javascripts/vue_shared/components/loading_icon.vue +++ b/app/assets/javascripts/vue_shared/components/loading_icon.vue @@ -12,9 +12,18 @@ required: false, default: '1', }, + + inline: { + type: Boolean, + required: false, + default: false, + }, }, computed: { + rootElementType() { + return this.inline ? 'span' : 'div'; + }, cssClass() { return `fa-${this.size}x`; }, @@ -22,12 +31,14 @@ }; </script> <template> - <div class="text-center"> + <component + :is="this.rootElementType" + class="text-center"> <i class="fa fa-spin fa-spinner" :class="cssClass" aria-hidden="true" :aria-label="label"> </i> - </div> + </component> </template> |