pleroma-fe

commit: 80203636803c3035a46d0d82c7778e4aff8d2612
parent: 6ac8a43e28e11c6970ec62733a551f41ce04e80c
Author: lambda <pleromagit@rogerbraun.net>
Date:   Mon, 20 Nov 2017 11:52:46 +0000

Merge branch 'fix/attachment-fixes-media-upload-unknown-type' into 'develop'

Hide unknown type attachments, polish the upload preview styling

See merge request pleroma/pleroma-fe!168
Diffstat:
M
src/components/attachment/attachment.js
2
+-
M
src/components/attachment/attachment.vue
2
++
M
src/components/post_status_form/post_status_form.vue
2
+-

3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
@@ -24,7 +24,7 @@ const Attachment = {
       return this.nsfw && this.hideNsfwLocal && !this.showHidden
     },
     isEmpty () {
-      return this.type === 'html' && !this.attachment.oembed
+      return (this.type === 'html' && !this.attachment.oembed) || this.type === 'unknown'
     }
   },
   methods: {
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
@@ -80,6 +80,8 @@
           }
 
           img.media-upload {
+              margin-bottom: -2px;
+              max-height: 300px;
               width: 100%;
               height: 100%;
               flex: 1;
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
@@ -25,7 +25,7 @@
         <i class="icon-cancel" @click="clearError"></i>
       </div>
       <div class="attachments">
-        <div class="attachment" v-for="file in newStatus.files">
+        <div class="attachment base03-border" v-for="file in newStatus.files">
           <i class="fa icon-cancel" @click="removeMediaFile(file)"></i>
           <img class="thumbnail media-upload" :src="file.image" v-if="type(file) === 'image'"></img>
           <video v-if="type(file) === 'video'" :src="file.image" controls></video>