drudge/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'issues/#466' into 'develop'

Browse source 
show replies count right after reply icon

Closes #466

See merge request pleroma/pleroma-fe!716
This commit is contained in:
Shpuld Shpludson 2019-03-28 20:09:59 +00:00
commit ee9aa40001
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -135,9 +135,8 @@
<div v-if="!noHeading && !isPreview" class='status-actions media-body'> <div v-if="!noHeading && !isPreview" class='status-actions media-body'>
<div v-if="loggedIn"> <div v-if="loggedIn">
<a href="#" v-on:click.prevent="toggleReplying" :title="$t('tool_tip.reply')"> <i class="button-icon icon-reply" v-on:click.prevent="toggleReplying" :title="$t('tool_tip.reply')" :class="{'icon-reply-active': replying}"></i>
<i class="button-icon icon-reply" :class="{'icon-reply-active': replying}"></i> <span v-if="status.replies_count > 0">{{status.replies_count}}</span>
</a>
</div> </div>
<retweet-button :visibility='status.visibility' :loggedIn='loggedIn' :status='status'></retweet-button> <retweet-button :visibility='status.visibility' :loggedIn='loggedIn' :status='status'></retweet-button>
<favorite-button :loggedIn='loggedIn' :status='status'></favorite-button> <favorite-button :loggedIn='loggedIn' :status='status'></favorite-button>
@ -551,6 +550,7 @@ $status-margin: 0.75em;
.icon-reply:hover { .icon-reply:hover {
color: $fallback--cBlue; color: $fallback--cBlue;
color: var(--cBlue, $fallback--cBlue); color: var(--cBlue, $fallback--cBlue);
cursor: pointer;
} }
.icon-reply.icon-reply-active { .icon-reply.icon-reply-active {

1
src/services/entity_normalizer/entity_normalizer.service.js
View file

@ -177,6 +177,7 @@ export const parseStatus = (data) => {
output.in_reply_to_status_id = data.in_reply_to_id output.in_reply_to_status_id = data.in_reply_to_id
output.in_reply_to_user_id = data.in_reply_to_account_id output.in_reply_to_user_id = data.in_reply_to_account_id
output.replies_count = data.replies_count
// Missing!! fix in UI? // Missing!! fix in UI?
// output.in_reply_to_screen_name = ??? // output.in_reply_to_screen_name = ???