graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-25 03:43:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

🎨

Browse source
This commit is contained in:
syuilo 2019-09-03 05:50:01 +09:00
parent 8de2f4ce76
commit fef8b662c1
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/client/app/common/views/components/reactions-viewer.details.vue
View file

@ -2,7 +2,9 @@
<transition name="zoom-in-top"> <transition name="zoom-in-top">
<div class="buebdbiu" ref="popover" v-if="show"> <div class="buebdbiu" ref="popover" v-if="show">
<i18n path="few-users" v-if="users.length <= 10"> <i18n path="few-users" v-if="users.length <= 10">
<span slot="users">{{ users.join(', ') }}</span> <span slot="users">
<mk-user-name v-for="u in users" :user="u" :key="u.id"/>
</span>
<mk-reaction-icon slot="reaction" :reaction="reaction" ref="icon" /> <mk-reaction-icon slot="reaction" :reaction="reaction" ref="icon" />
</i18n> </i18n>
<i18n path="many-users" v-if="10 < users.length"> <i18n path="many-users" v-if="10 < users.length">
@ -76,6 +78,8 @@ export default Vue.extend({
color var(--text) color var(--text)
border-radius 4px border-radius 4px
box-shadow 0 var(--lineWidth) 4px rgba(#000, 0.25) box-shadow 0 var(--lineWidth) 4px rgba(#000, 0.25)
pointer-events none
transform-origin center -16px
&:before &:before
content "" content ""

2
src/client/app/common/views/components/reactions-viewer.reaction.vue
View file

@ -104,7 +104,7 @@ export default Vue.extend({
}).then((reactions: any[]) => { }).then((reactions: any[]) => {
const users = reactions.filter(x => x.type === this.reaction) const users = reactions.filter(x => x.type === this.reaction)
.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()) .sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime())
.map(x => x.user.username); .map(x => x.user);
this.closeDetails(); this.closeDetails();
if (!this.isHovering) return; if (!this.isHovering) return;