butter/keanu-weblite
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'room-settings-trash-icon' into 'dev'

Browse source 
room settings trash icon

See merge request keanuapp/keanuapp-weblite!143
This commit is contained in:
N Pex 2023-03-03 14:38:48 +00:00
commit 7396fbc959
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/assets/css/main.scss
View file

@ -122,6 +122,12 @@ body { position:absolute; top:0; bottom:0; right:0; left:0; }
min-height: $chat-standard-padding !important; min-height: $chat-standard-padding !important;
margin-top: $chat-standard-padding-xs; margin-top: $chat-standard-padding-xs;
margin-bottom: $chat-standard-padding-xs; margin-bottom: $chat-standard-padding-xs;
.v-icon {
height: 14px;
width: 14px;
margin-right: 8px;
}
} }
.v-dialog { .v-dialog {

17
src/components/RoomInfo.vue
View file

@ -254,11 +254,12 @@
id="btn-purge-room" id="btn-purge-room"
v-if="userCanPurgeRoom" v-if="userCanPurgeRoom"
color="red" color="red"
depressed fab
class="filled-button" class="filled-button"
@click.stop="showPurgeConfirmation = true" @click.stop="showPurgeConfirmation = true"
>{{ $t("room_info.purge") }}</v-btn >
> <v-icon light>$vuetify.icons.ic_moderator-delete</v-icon> {{ $t("room_info.purge") }}
</v-btn>
</div> </div>
<div class="build-version"> <div class="build-version">
@ -599,7 +600,7 @@ export default {
}, },
/** /**
* Return true if WE can make the member an admin * Return true if WE can make the member an admin
* @param member * @param member
*/ */
canMakeAdmin(ignoredmember) { canMakeAdmin(ignoredmember) {
if (this.room) { if (this.room) {
@ -612,7 +613,7 @@ export default {
/** /**
* Return true if WE can make the member a moderator * Return true if WE can make the member a moderator
* @param member * @param member
*/ */
canMakeModerator(ignoredmember) { canMakeModerator(ignoredmember) {
if (this.room) { if (this.room) {
@ -620,11 +621,11 @@ export default {
const me = this.room.getMember(myUserId); const me = this.room.getMember(myUserId);
return me && this.isAdmin(me); return me && this.isAdmin(me);
} }
return false; return false;
}, },
/** /**
* Return true if WE can "unmake" the member a moderator * Return true if WE can "unmake" the member a moderator
* @param member * @param member
*/ */
canRevokeModerator(member) { canRevokeModerator(member) {
if (this.room) { if (this.room) {
@ -632,7 +633,7 @@ export default {
const me = this.room.getMember(myUserId); const me = this.room.getMember(myUserId);
return me && this.isAdmin(me) && me.powerLevel > member.powerLevel; return me && this.isAdmin(me) && me.powerLevel > member.powerLevel;
} }
return false; return false;
}, },
makeAdmin(member) { makeAdmin(member) {
if (this.room) { if (this.room) {