diff --git a/index.html b/index.html index 93d9d6fd4e..ec831c415f 100644 --- a/index.html +++ b/index.html @@ -4,6 +4,7 @@ Pleroma +
diff --git a/src/App.scss b/src/App.scss index c155de730b..a97ad56de3 100644 --- a/src/App.scss +++ b/src/App.scss @@ -1,7 +1,4 @@ -$main-color: #f58d2c; -$main-background: white; -$darkened-background: whitesmoke; - +@import './_variables.scss'; #app { background-color: $main-color; background-size: cover; @@ -225,9 +222,10 @@ status.ng-enter.ng-enter-active { } .fa { - color: $main-color; + color: grey; } + .status-actions { width: 50%; display: flex; diff --git a/src/_variables.scss b/src/_variables.scss new file mode 100644 index 0000000000..c317fd3240 --- /dev/null +++ b/src/_variables.scss @@ -0,0 +1,6 @@ +$main-color: #f58d2c; +$main-background: white; +$darkened-background: whitesmoke; +$green: #0fa00f; +$blue: #0095ff; + diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue index 0455c70603..6eaf0607b5 100644 --- a/src/components/favorite_button/favorite_button.vue +++ b/src/components/favorite_button/favorite_button.vue @@ -7,8 +7,15 @@ - diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js index 8ae86a8de5..3f2e39641b 100644 --- a/src/components/media_upload/media_upload.js +++ b/src/components/media_upload/media_upload.js @@ -11,11 +11,24 @@ const mediaUpload = { const file = target.files[0] const formData = new FormData() formData.append('media', file) + + self.$emit('uploading') + self.uploading = true + statusPosterService.uploadMedia({ store, formData }) .then((fileData) => { self.$emit('uploaded', fileData) + self.uploading = false + }, (error) => { + self.$emit('upload-failed') + self.uploading = false }) }) + }, + data () { + return { + uploading: false + } } } diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue index a62d831698..f2f0b83f9a 100644 --- a/src/components/media_upload/media_upload.vue +++ b/src/components/media_upload/media_upload.vue @@ -1,7 +1,8 @@