moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fix #38 and video CSS

Closes #38

See merge request pleroma/pleroma-fe!136
This commit is contained in:
lambda 2017-11-08 17:42:42 +00:00
parent 26a8923a87 0e716e3cd9
commit 5322f90c15
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/attachment/attachment.vue
View File

@ -11,7 +11,7 @@
<img class="base03-border" referrerpolicy="no-referrer" :src="attachment.large_thumb_url || attachment.url"/> <img class="base03-border" referrerpolicy="no-referrer" :src="attachment.large_thumb_url || attachment.url"/>
</a> </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> <audio v-if="type === 'audio'" :src="attachment.url" controls></audio>
@ -59,6 +59,7 @@
} }
video { video {
max-height: 500px;
height: 100%; height: 100%;
border: 1px solid; border: 1px solid;
border-radius: 5px; border-radius: 5px;
@ -103,6 +104,7 @@
.text { .text {
flex: 2; flex: 2;
margin: 8px; margin: 8px;
word-break: break-all;
h1 { h1 {
font-size: 14px; font-size: 14px;
margin: 0px; margin: 0px;