moved mentions onto reply line, replies moved below post body

This commit is contained in:
Henry Jameson 2021-06-10 12:15:14 +03:00
parent aec867b300
commit c6c478f4cf
1 changed files with 37 additions and 42 deletions

View File

@ -267,38 +267,13 @@
:first-mention="false" :first-mention="false"
/> />
<span <span
v-if="replies && replies.length" v-if="isReply && hasMentions"
class="faint replies-separator" class="faint replies-separator"
> >
- -
</span> </span>
</div> <span
<div
v-if="inConversation && !isPreview && replies && replies.length"
class="replies"
>
<span class="faint">{{ $t('status.replies_list') }}</span>
<StatusPopover
v-for="reply in replies"
:key="reply.id"
:status-id="reply.id"
>
<button
class="button-unstyled -link reply-link"
@click.prevent="gotoOriginal(reply.id)"
>
{{ reply.name }}
</button>
</StatusPopover>
</div>
</div>
<div
v-if="hasMentionsLine" v-if="hasMentionsLine"
class="heading-mentions-row"
>
<div
class="mentions"
> >
<span <span
class="button-unstyled reply-to" class="button-unstyled reply-to"
@ -319,6 +294,7 @@
:mentions="mentionsLine" :mentions="mentionsLine"
class="mentions-line" class="mentions-line"
/> />
</span>
</div> </div>
</div> </div>
</div> </div>
@ -332,6 +308,25 @@
@mediapause="removeMediaPlaying($event)" @mediapause="removeMediaPlaying($event)"
/> />
<div
v-if="inConversation && !isPreview && replies && replies.length"
class="replies"
>
<span class="faint">{{ $t('status.replies_list') }}</span>
<StatusPopover
v-for="reply in replies"
:key="reply.id"
:status-id="reply.id"
>
<button
class="button-unstyled -link reply-link"
@click.prevent="gotoOriginal(reply.id)"
>
{{ reply.name }}
</button>
</StatusPopover>
</div>
<transition name="fade"> <transition name="fade">
<div <div
v-if="!hidePostStats && isFocused && combinedFavsAndRepeatsUsers.length > 0" v-if="!hidePostStats && isFocused && combinedFavsAndRepeatsUsers.length > 0"