UI Fixes and DeviceList changes
This commit is contained in:
parent
d766f9a0e3
commit
a1d729d812
5 changed files with 38 additions and 48 deletions
|
|
@ -8,7 +8,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<v-avatar class="avatar" ref="avatar" size="32" color="#ededed" @click.stop="otherAvatarClicked($refs.avatar.$el)">
|
||||
<img v-if="messageEventAvatar(event)" :src="messageEventAvatar(event)" onerror="this.style.display='none'" />
|
||||
<AuthedImage v-if="messageEventAvatar(event)" :src="messageEventAvatar(event)" onerror="this.style.display='none'" />
|
||||
<span v-else class="text-white headline">{{
|
||||
eventSenderDisplayName(event).substring(0, 1).toUpperCase()
|
||||
}}</span>
|
||||
|
|
@ -35,10 +35,11 @@ import messageMixin from "./messageMixin";
|
|||
import util, { ROOM_TYPE_CHANNEL } from "../../plugins/utils";
|
||||
import QuickReactions from "./QuickReactions.vue";
|
||||
import QuickReactionsChannel from "./channel/QuickReactionsChannel.vue";
|
||||
import AuthedImage from "../AuthedImage.vue";
|
||||
|
||||
export default {
|
||||
mixins: [messageMixin],
|
||||
components: { QuickReactions, QuickReactionsChannel, SeenBy },
|
||||
components: { AuthedImage, QuickReactions, QuickReactionsChannel, SeenBy },
|
||||
data() {
|
||||
return { ROOM_TYPE_CHANNEL: ROOM_TYPE_CHANNEL }
|
||||
},
|
||||
|
|
|
|||
|
|
@ -7,13 +7,12 @@
|
|||
v-show="showAllReaction || index < REACTION_LIMIT"
|
||||
>
|
||||
<v-tooltip top v-if="value.includes($matrix.currentUserId)">
|
||||
<template v-slot:activator="{ on, attrs }">
|
||||
<template v-slot:activator="{ props }">
|
||||
<v-chip
|
||||
class="pa-2 ma-1 ml-0"
|
||||
variant="outlined"
|
||||
size="small"
|
||||
v-bind="attrs"
|
||||
v-on="on"
|
||||
v-bind="props"
|
||||
@click="onClickEmoji(name)"
|
||||
>
|
||||
{{ name }} {{ value.length }}
|
||||
|
|
@ -40,13 +39,12 @@
|
|||
{{ otherReactionText }}
|
||||
</v-chip>
|
||||
<v-tooltip top v-if="!!totalReaction">
|
||||
<template v-slot:activator="{ on, attrs }">
|
||||
<template v-slot:activator="{ props }">
|
||||
<v-chip
|
||||
variant="outlined"
|
||||
size="small"
|
||||
class="pa-2 ma-1 ml-0"
|
||||
v-bind="attrs"
|
||||
v-on="on"
|
||||
v-bind="props"
|
||||
@click="more"
|
||||
>
|
||||
<v-icon size="small"> $vuetify.icons.addReaction </v-icon>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue