therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into 'feature/attachment-form-improvements'

Browse source 
# Conflicts:
#   src/components/attachment/attachment.js
This commit is contained in:
dtluna 2016-11-25 21:02:53 -05:00
commit cb940a8742
15 changed files with 219 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/attachment/attachment.vue
View file

@ -11,6 +11,8 @@
<video v-if="type === 'video' && !nsfw" :src="attachment.url" controls></video>
<audio v-if="type === 'audio'" :src="attachment.url" controls></audio>
<span v-if="type === 'unknown'">Don't know how to display this...</span>
<div v-if="type === 'html' && attachment.oembed" class="oembed">
@ -45,6 +47,10 @@
width: 100%;
}
audio {
width: 100%;
}
img.media-upload {
width: 100%;
height: 100%;
@ -94,7 +100,6 @@
img {
width: 100%;
flex: 1;
border: 1px solid;
border-radius: 0.5em;
width: 100%;