aboutsummaryrefslogtreecommitdiff
path: root/src/components/media_upload/media_upload.vue
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2016-11-14 21:11:27 +0100
committerRoger Braun <roger@rogerbraun.net>2016-11-14 21:11:27 +0100
commitd4284686fa791cc1a43ae058375e1d51d8f1bd5b (patch)
treeac590e54fbe6e3455022c268ed2f61933aed62bf /src/components/media_upload/media_upload.vue
parentaeb8868b82c767e6c8bf19aa8e6355f71941fea5 (diff)
parenta9d65a488f12968fe947418846a3942d43b424fa (diff)
Merge branch 'master' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/retweet
Diffstat (limited to 'src/components/media_upload/media_upload.vue')
-rw-r--r--src/components/media_upload/media_upload.vue3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue
index a62d8316..f2f0b83f 100644
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@@ -1,7 +1,8 @@
<template>
<div class="media-upload">
<label class="btn btn-default">
- <i class="fa icon-upload"></i>
+ <i class="fa icon-spin4 animate-spin" v-if="uploading"></i>
+ <i class="fa icon-upload" v-if="!uploading"></i>
<input type=file style="position: fixed; top: -100em"></input>
</label>
</div>