aboutsummaryrefslogtreecommitdiff
path: root/src/components/attachment/attachment.vue
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2017-11-13 09:34:16 +0000
committerlambda <pleromagit@rogerbraun.net>2017-11-13 09:34:16 +0000
commitc3b401167dcee32f57a271fc966a811cfe4b1fc5 (patch)
tree64d952e7c531aa72a52fe26911509fe7cf43b8a9 /src/components/attachment/attachment.vue
parentd7e4279c590a002411abb31f2f164301fdb34493 (diff)
parentbac092d953eb661bcbcc06b734c509e68f939818 (diff)
Merge branch 'fix/css-fixes-attachments-timeline-bottom' into 'develop'
CSS fixes Closes #39 See merge request pleroma/pleroma-fe!154
Diffstat (limited to 'src/components/attachment/attachment.vue')
-rw-r--r--src/components/attachment/attachment.vue5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index d4985732..954c46b4 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -1,5 +1,5 @@
<template>
- <div class="attachment base03-border" :class="{[type]: true, loading}" :style="autoHeight">
+ <div class="attachment base03-border" :class="{[type]: true, loading}" v-show="!isEmpty">
<a class="image-attachment" v-if="hidden" @click.prevent="toggleHidden()">
<img :key="nsfwImage" :src="nsfwImage"/>
</a>
@@ -50,7 +50,8 @@
}
&.html {
- flex-basis: 100%;
+ flex-basis: 90%;
+ width: 100%;
display: flex;
}