Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

moved mentions onto reply line, replies moved below post body

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

79
src/components/status/status.vue
View file

@ -267,58 +267,34 @@
: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>
<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"
class="heading-mentions-row"
>
<div
class="mentions"
>
<span <span
class="button-unstyled reply-to" v-if="hasMentionsLine"
:aria-label="$t('tool_tip.reply')"
@click.prevent="gotoOriginal(status.in_reply_to_status_id)"
> >
<FAIcon
class="fa-scale-110 fa-old-padding"
icon="at"
/>
<span <span
class="faint-link reply-to-text" class="button-unstyled reply-to"
:aria-label="$t('tool_tip.reply')"
@click.prevent="gotoOriginal(status.in_reply_to_status_id)"
> >
{{ $t('status.mentions') }} <FAIcon
class="fa-scale-110 fa-old-padding"
icon="at"
/>
<span
class="faint-link reply-to-text"
>
{{ $t('status.mentions') }}
</span>
</span> </span>
<MentionsLine
:mentions="mentionsLine"
class="mentions-line"
/>
</span> </span>
<MentionsLine
:mentions="mentionsLine"
class="mentions-line"
/>
</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"