Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop

This commit is contained in:
sadposter 2020-11-01 12:26:14 +00:00
commit e21dd584a9
169 changed files with 3933 additions and 1616 deletions

View file

@ -55,29 +55,29 @@
@click.prevent="toggleShowMore"
>
{{ $t("status.show_content") }}
<span
<FAIcon
v-if="attachmentTypes.includes('image')"
class="icon-picture"
icon="image"
/>
<span
<FAIcon
v-if="attachmentTypes.includes('video')"
class="icon-video"
icon="video"
/>
<span
<FAIcon
v-if="attachmentTypes.includes('audio')"
class="icon-music"
icon="music"
/>
<span
<FAIcon
v-if="attachmentTypes.includes('unknown')"
class="icon-doc"
icon="file"
/>
<span
<FAIcon
v-if="status.poll && status.poll.options"
class="icon-chart-bar"
icon="poll-h"
/>
<span
<FAIcon
v-if="status.card"
class="icon-link"
icon="link"
/>
</a>
<a
@ -107,6 +107,8 @@
:attachment="attachment"
:allow-play="true"
:set-media="setMedia()"
@play="$emit('mediaplay', attachment.id)"
@pause="$emit('mediapause', attachment.id)"
/>
<gallery
v-if="galleryAttachments.length > 0"
@ -180,6 +182,10 @@ $status-margin: 0.75em;
text-align: center;
display: inline-block;
word-break: break-all;
svg {
color: inherit;
}
}
img, video {