diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-28 07:33:03 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-28 07:33:03 +0000 |
| commit | b558dc81f65a7d2ab9ddc3b374afc759b74f3688 (patch) | |
| tree | d06a8eb5c72a6e80df05cd2c6536813870c296f6 | |
| parent | 08ad0af49c017d740b43588c0809b3811d25a448 (diff) | |
| parent | 236b921bd6d006b007b19437a76cb5d7f034b6b0 (diff) | |
| download | gitlab-ce-b558dc81f65a7d2ab9ddc3b374afc759b74f3688.tar.gz | |
Merge branch 'backport-inline-loading-icon' into 'master'
Backport inline prop on loading_icon from EE
See merge request !12490
| -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> |