diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-05-31 11:00:53 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-05-31 11:00:53 +0000 |
| commit | dc611dffdbf8f24c10caa7651651efbff1acfe67 (patch) | |
| tree | 9231422f2f448204685c69984a2859a0f014dcab /src/components/attachment/attachment.vue | |
| parent | 0741d1d93d1ff40489747c0dcfd652be8bf6e2ab (diff) | |
| parent | 245addb530f04510d072531eef45e7f30c79e237 (diff) | |
Merge branch 'flash-support' into 'develop'
Flash support
See merge request pleroma/pleroma-fe!1380
Diffstat (limited to 'src/components/attachment/attachment.vue')
| -rw-r--r-- | src/components/attachment/attachment.vue | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 2c1c1682..f80badfd 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -117,6 +117,11 @@ <!-- eslint-enable vue/no-v-html --> </div> </div> + + <Flash + v-if="type === 'flash'" + :src="attachment.large_thumb_url || attachment.url" + /> </div> </template> @@ -172,6 +177,7 @@ } .non-gallery.attachment { + &.flash, &.video { flex: 1 0 40%; } |