Skip to content

Improve deleted messages look #5075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Feb 3, 2021
Merged

Improve deleted messages look #5075

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions src/components/MessagesList/MessagesGroup/Message/Message.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ the main body of the message as well as a quote.
:id="`message_${id}`"
ref="message"
class="message"
:class="{'hover': showActions && !isSystemMessage, 'system' : isSystemMessage}"
@mouseover="showActions=true"
@mouseleave="showActions=false">
:class="{'hover': showActions && !isSystemMessage && !isDeletedMessage, 'system' : isSystemMessage}"
@mouseover="handleMouseover"
@mouseleave="handleMouseleave">
<div v-if="isFirstMessage && showAuthor"
class="message__author"
role="heading"
Expand Down Expand Up @@ -59,7 +59,7 @@ the main body of the message as well as a quote.
<Quote v-if="parent" :parent-id="parent" v-bind="quote" />
<RichText :text="message" :arguments="richParameters" :autolink="true" />
</div>
<div class="message__main__right">
<div v-if="!isDeletedMessage" class="message__main__right">
<span
v-tooltip.auto="messageDate"
class="date"
Expand Down Expand Up @@ -169,7 +169,7 @@ import {
showError,
showSuccess,
showWarning,
TOAST_DEFAULT_TIMEOUT
TOAST_DEFAULT_TIMEOUT,
} from '@nextcloud/dialogs'

export default {
Expand Down Expand Up @@ -359,7 +359,7 @@ export default {

showCommonReadIcon() {
return this.conversation.lastCommonReadMessage >= this.id
&& this.showSentIcon
&& this.showSentIcon && !this.isDeletedMessage
},

showSentIcon() {
Expand All @@ -368,6 +368,7 @@ export default {
&& !this.isDeleting
&& this.actorType === this.participant.actorType
&& this.actorId === this.participant.actorId
&& !this.isDeletedMessage
},

messagesList() {
Expand Down Expand Up @@ -594,6 +595,14 @@ export default {

this.isDeleting = false
},

handleMouseover() {
this.showActions = true
},

handleMouseleave() {
this.showActions = false
},
},
}
</script>
Expand Down Expand Up @@ -636,10 +645,10 @@ export default {
}

&.deleted-message {
background-color: var(--color-background-dark);
color: var(--color-text-lighter);
padding: var(--border-radius) var(--border-radius-large);
display: flex;
border-radius: var(--border-radius-large);
align-items: center;
}

::v-deep .rich-text--wrapper {
Expand Down