diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-01-30 18:58:08 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-01-30 18:58:08 +0000 |
| commit | 5b7b1dfebc37bd5db4e839973062b452b02c898d (patch) | |
| tree | a517e4942725286b173b685cbe87bc6c7878b66e /src/components/status/status.vue | |
| parent | b1facdf7ad54436c2afde7c28c917cda87a5b7e3 (diff) | |
| parent | c7cffbb6c70bbb21cf787d96e82e0261427b9234 (diff) | |
Merge branch 'feat/media-modal' into 'develop'
modal for viewing attachments in-tab
See merge request pleroma/pleroma-fe!468
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 45100a46..c6e73e4e 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -93,9 +93,23 @@ <a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">Show less</a> </div> - <div v-if='status.attachments && !hideSubjectStatus' class='attachments media-body'> - <attachment :size="attachmentSize" :status-id="status.id" :nsfw="nsfwClickthrough" :attachment="attachment" v-for="attachment in status.attachments" :key="attachment.id"> - </attachment> + <div v-if="status.attachments && !hideSubjectStatus" class="attachments media-body"> + <attachment + class="non-gallery" + v-for="attachment in nonGalleryAttachments" + :size="attachmentSize" + :nsfw="nsfwClickthrough" + :attachment="attachment" + :allowPlay="true" + :setMedia="setMedia()" + :key="attachment.id" + /> + <gallery + v-if="galleryAttachments.length > 0" + :nsfw="nsfwClickthrough" + :attachments="galleryAttachments" + :setMedia="setMedia()" + /> </div> <div v-if="status.card && !hideSubjectStatus && !noHeading" class="link-preview media-body"> @@ -569,7 +583,7 @@ a.unmute { } } -@media all and (max-width: 960px) { +@media all and (max-width: 800px) { .status-el { .retweet-info { .avatar { |