diff options
| author | Henry Jameson <me@hjkos.com> | 2021-06-10 12:15:14 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2021-06-10 12:29:58 +0300 |
| commit | c6c478f4cf123d9510e1e67a852cad0398d08052 (patch) | |
| tree | e9c27a4a3f602bf764fbfa25f6306ba68cdd99ff /src/components/status/status.vue | |
| parent | aec867b30036fd039113e4197ca98566447efec6 (diff) | |
moved mentions onto reply line, replies moved below post body
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 79 |
1 files changed, 37 insertions, 42 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 05d22232..62ad0eac 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -267,58 +267,34 @@ :first-mention="false" /> <span - v-if="replies && replies.length" + v-if="isReply && hasMentions" class="faint replies-separator" > - </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 - class="button-unstyled reply-to" - :aria-label="$t('tool_tip.reply')" - @click.prevent="gotoOriginal(status.in_reply_to_status_id)" + v-if="hasMentionsLine" > - <FAIcon - class="fa-scale-110 fa-old-padding" - icon="at" - /> <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> + <MentionsLine + :mentions="mentionsLine" + class="mentions-line" + /> </span> - <MentionsLine - :mentions="mentionsLine" - class="mentions-line" - /> </div> </div> </div> @@ -332,6 +308,25 @@ @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"> <div v-if="!hidePostStats && isFocused && combinedFavsAndRepeatsUsers.length > 0" |