Fix "YouAre" component
This commit is contained in:
parent
110394a40a
commit
e4d2f00f76
4 changed files with 17 additions and 22 deletions
|
|
@ -37,7 +37,7 @@ body {
|
||||||
box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.25) !important;
|
box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.25) !important;
|
||||||
border-radius: 18px;
|
border-radius: 18px;
|
||||||
padding-bottom: 10px;
|
padding-bottom: 10px;
|
||||||
.v-item-group > div:not(:last-of-type):after {
|
.v-list > .v-list-item:not(:last-of-type):before {
|
||||||
/* divider */
|
/* divider */
|
||||||
position: absolute;
|
position: absolute;
|
||||||
content: " ";
|
content: " ";
|
||||||
|
|
@ -905,6 +905,7 @@ body {
|
||||||
.room-list {
|
.room-list {
|
||||||
.room-list-room {
|
.room-list-room {
|
||||||
color: white; // Used as selected item background
|
color: white; // Used as selected item background
|
||||||
|
min-height: 58px;
|
||||||
.v-avatar:not(.round) {
|
.v-avatar:not(.round) {
|
||||||
// Make avatars rounded squares!
|
// Make avatars rounded squares!
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<v-list dense class="room-list">
|
<v-list class="room-list">
|
||||||
<v-list-item v-if="showCreate" @click.stop="$emit('newroom')" class="room-list-room" :value="null">
|
<v-list-item v-if="showCreate" @click.stop="$emit('newroom')" class="room-list-room" :value="null">
|
||||||
<template v-slot:prepend>
|
<template v-slot:prepend>
|
||||||
<v-avatar class="round" size="42" color="#d9d9d9">
|
<v-avatar class="round" size="42" color="#d9d9d9">
|
||||||
|
|
|
||||||
|
|
@ -39,21 +39,21 @@
|
||||||
<DeviceList :member="activeMember" />
|
<DeviceList :member="activeMember" />
|
||||||
<div class="py-3" v-if="activeMember.userId != $matrix.currentUserId">
|
<div class="py-3" v-if="activeMember.userId != $matrix.currentUserId">
|
||||||
<v-btn text size="x-large" block v-if="activeMember.userId != $matrix.currentUserId && !$matrix.isDirectRoomWith(room, activeMember.userId)" class="start-private-chat clickable d-block text-none justify-start" @click="startPrivateChat(activeMember.userId)">
|
<v-btn text size="x-large" block v-if="activeMember.userId != $matrix.currentUserId && !$matrix.isDirectRoomWith(room, activeMember.userId)" class="start-private-chat clickable d-block text-none justify-start" @click="startPrivateChat(activeMember.userId)">
|
||||||
<v-icon left>$vuetify.icons.direct_chat</v-icon> {{ $t("menu.direct_chat") }}
|
<v-icon start>$vuetify.icons.direct_chat</v-icon> {{ $t("menu.direct_chat") }}
|
||||||
</v-btn>
|
</v-btn>
|
||||||
<div v-if="canBanUserComp">
|
<div v-if="canBanUserComp">
|
||||||
<v-btn text x-large block v-if="activeMember.userId != $matrix.currentUserId && canBanUserComp" class="start-private-chat clickable d-block text-none justify-start" @click="banUser(activeMember)">
|
<v-btn text x-large block v-if="activeMember.userId != $matrix.currentUserId && canBanUserComp" class="start-private-chat clickable d-block text-none justify-start" @click="banUser(activeMember)">
|
||||||
<v-icon left>$vuetify.icons.kickout</v-icon> {{ $t("menu.user_kick_and_ban") }}
|
<v-icon start>$vuetify.icons.kickout</v-icon> {{ $t("menu.user_kick_and_ban") }}
|
||||||
</v-btn>
|
</v-btn>
|
||||||
</div>
|
</div>
|
||||||
<v-btn text size="x-large" block v-if="activeMember.userId != $matrix.currentUserId && !isAdminComp && canMakeAdminComp" class="start-private-chat clickable d-block text-none justify-start" @click="makeAdmin(activeMember)">
|
<v-btn text size="x-large" block v-if="activeMember.userId != $matrix.currentUserId && !isAdminComp && canMakeAdminComp" class="start-private-chat clickable d-block text-none justify-start" @click="makeAdmin(activeMember)">
|
||||||
<v-icon left>$vuetify.icons.make_admin</v-icon> {{ $t("menu.user_make_admin") }}
|
<v-icon start>$vuetify.icons.make_admin</v-icon> {{ $t("menu.user_make_admin") }}
|
||||||
</v-btn>
|
</v-btn>
|
||||||
<v-btn text size="x-large" block v-if="activeMember.userId != $matrix.currentUserId && !isModeratorComp && !isAdminComp && canMakeModeratorComp" class="start-private-chat clickable d-block text-none justify-start" @click="makeModerator(activeMember)">
|
<v-btn text size="x-large" block v-if="activeMember.userId != $matrix.currentUserId && !isModeratorComp && !isAdminComp && canMakeModeratorComp" class="start-private-chat clickable d-block text-none justify-start" @click="makeModerator(activeMember)">
|
||||||
<v-icon left>$vuetify.icons.make_moderator</v-icon> {{ $t("menu.user_make_moderator") }}
|
<v-icon start>$vuetify.icons.make_moderator</v-icon> {{ $t("menu.user_make_moderator") }}
|
||||||
</v-btn>
|
</v-btn>
|
||||||
<v-btn text size="x-large" block v-if="activeMember.userId != $matrix.currentUserId && isModeratorComp && canRevokeModeratorComp" class="start-private-chat clickable d-block text-none justify-start" @click="revokeModerator(activeMember)">
|
<v-btn text size="x-large" block v-if="activeMember.userId != $matrix.currentUserId && isModeratorComp && canRevokeModeratorComp" class="start-private-chat clickable d-block text-none justify-start" @click="revokeModerator(activeMember)">
|
||||||
<v-icon left>$vuetify.icons.revoke</v-icon> {{ $t("menu.user_revoke_moderator") }}
|
<v-icon start>$vuetify.icons.revoke</v-icon> {{ $t("menu.user_revoke_moderator") }}
|
||||||
</v-btn>
|
</v-btn>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,9 @@
|
||||||
<v-chip
|
<v-chip
|
||||||
@click="viewProfile"
|
@click="viewProfile"
|
||||||
class="ma-2 white-space-pre"
|
class="ma-2 white-space-pre"
|
||||||
:color="dark ? 'black' : '#ededed'"
|
color="#ededed"
|
||||||
:text-color="dark ? 'white' : 'black'"
|
style="color:black"
|
||||||
:variant="!dark ? 'ouelined' : 'tonal'"
|
variant="outlined"
|
||||||
>{{ $t("profile_info_popup.you_are") }}
|
>{{ $t("profile_info_popup.you_are") }}
|
||||||
<span v-if="$matrix.currentUser.is_guest">
|
<span v-if="$matrix.currentUser.is_guest">
|
||||||
<i18n-t keypath="profile_info_popup.identity_temporary" tag="span">
|
<i18n-t keypath="profile_info_popup.identity_temporary" tag="span">
|
||||||
|
|
@ -21,10 +21,12 @@
|
||||||
</template>
|
</template>
|
||||||
</i18n-t>
|
</i18n-t>
|
||||||
</span>
|
</span>
|
||||||
<v-avatar color="#e0e0e0" right @click.stop="viewProfile">
|
<template v-slot:append>
|
||||||
<AuthedImage v-if="userAvatar" :src="userAvatar" />
|
<v-avatar color="#e0e0e0" end @click.stop="viewProfile">
|
||||||
<span v-else class="text-white">{{ userAvatarLetter }}</span>
|
<AuthedImage v-if="userAvatar" :src="userAvatar" />
|
||||||
</v-avatar>
|
<span v-else class="text-white">{{ userAvatarLetter }}</span>
|
||||||
|
</v-avatar>
|
||||||
|
</template>
|
||||||
</v-chip>
|
</v-chip>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -36,14 +38,6 @@ export default {
|
||||||
name: "YouAre",
|
name: "YouAre",
|
||||||
mixins: [profileInfoMixin],
|
mixins: [profileInfoMixin],
|
||||||
components: { AuthedImage },
|
components: { AuthedImage },
|
||||||
props: {
|
|
||||||
dark: {
|
|
||||||
type: Boolean,
|
|
||||||
default: function () {
|
|
||||||
return false;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
data() {
|
data() {
|
||||||
return {};
|
return {};
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue