pleroma-fe

commit: 5322f90c15db702a66821daa41eba4eaf343fe68
parent: 26a8923a8736e7c46442008b485690bf98c12e39
Author: lambda <pleromagit@rogerbraun.net>
Date:   Wed,  8 Nov 2017 17:42:42 +0000

Merge branch 'fix/attachment-fixes' into 'develop'

Fix #38 and video CSS

Closes #38

See merge request pleroma/pleroma-fe!136
Diffstat:
M
src/components/attachment/attachment.vue
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
@@ -11,7 +11,7 @@
       <img class="base03-border" referrerpolicy="no-referrer" :src="attachment.large_thumb_url || attachment.url"/>
     </a>
 
-    <video v-if="type === 'video' && !hidden" :src="attachment.url" controls loop></video>
+    <video class="base03" v-if="type === 'video' && !hidden" :src="attachment.url" controls loop></video>
 
     <audio v-if="type === 'audio'" :src="attachment.url" controls></audio>
 
@@ -59,6 +59,7 @@
           }
 
           video {
+              max-height: 500px;
               height: 100%;
               border: 1px solid;
               border-radius: 5px;
@@ -103,6 +104,7 @@
               .text {
                   flex: 2;
                   margin: 8px;
+                  word-break: break-all;
                   h1 {
                       font-size: 14px;
                       margin: 0px;