diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-24 07:29:49 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-24 07:29:49 +0000 |
| commit | 38cab5e4b695eea90b01c2866976960e9fc01128 (patch) | |
| tree | 5379c6f64290f9625ab0c97642501fa7060d4993 /src/components/media_upload/media_upload.vue | |
| parent | 1dfb8d14b21cac8a1349146df03d35c1d2ec6005 (diff) | |
| parent | 10be553910f3e17ee64befbcd7318230afe674b6 (diff) | |
Merge branch 'fix/better-icon-colors' into 'develop'
Update icons to use base09 where appropriate, calculate base09 by averaging bg and text colors.
See merge request pleroma/pleroma-fe!174
Diffstat (limited to 'src/components/media_upload/media_upload.vue')
| -rw-r--r-- | src/components/media_upload/media_upload.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue index b839067b..9e6ad608 100644 --- a/src/components/media_upload/media_upload.vue +++ b/src/components/media_upload/media_upload.vue @@ -1,8 +1,8 @@ <template> <div class="media-upload" @drop.prevent @dragover.prevent="fileDrag" @drop="fileDrop"> <label class="btn btn-default"> - <i class="fa icon-spin4 animate-spin" v-if="uploading"></i> - <i class="fa icon-upload" v-if="!uploading"></i> + <i class="base09 icon-spin4 animate-spin" v-if="uploading"></i> + <i class="base09 icon-upload" v-if="!uploading"></i> <input type=file style="position: fixed; top: -100em"></input> </label> </div> |