diff --git a/app/javascript/dashboard/components-next/Inbox/InboxCard.vue b/app/javascript/dashboard/components-next/Inbox/InboxCard.vue index 79a451404..90cc1ff53 100644 --- a/app/javascript/dashboard/components-next/Inbox/InboxCard.vue +++ b/app/javascript/dashboard/components-next/Inbox/InboxCard.vue @@ -63,11 +63,12 @@ const lastActivityAt = computed(() => { }); const menuItems = computed(() => [ - { key: 'delete', label: t('INBOX.MENU_ITEM.DELETE') }, { key: isUnread.value ? 'mark_as_read' : 'mark_as_unread', + icon: isUnread.value ? 'mail' : 'mail-unread', label: t(`INBOX.MENU_ITEM.MARK_AS_${isUnread.value ? 'READ' : 'UNREAD'}`), }, + { key: 'delete', icon: 'delete', label: t('INBOX.MENU_ITEM.DELETE') }, ]); const messageClasses = computed(() => ({ diff --git a/app/javascript/dashboard/routes/dashboard/inbox/InboxList.vue b/app/javascript/dashboard/routes/dashboard/inbox/InboxList.vue index ce6bd8be0..6f6f6cad3 100644 --- a/app/javascript/dashboard/routes/dashboard/inbox/InboxList.vue +++ b/app/javascript/dashboard/routes/dashboard/inbox/InboxList.vue @@ -246,7 +246,7 @@ onMounted(() => { :key="notificationItem.id" :inbox-item="notificationItem" :state-inbox="stateInbox(notificationItem.primaryActor?.inboxId)" - class="inbox-card rounded-lg hover:rounded-lg hover:bg-n-alpha-1 dark:hover:bg-n-alpha-3" + class="inbox-card rounded-none hover:rounded-lg hover:bg-n-alpha-1 dark:hover:bg-n-alpha-3" :class=" currentConversationId === notificationItem.primaryActor?.id ? 'bg-n-alpha-1 dark:bg-n-alpha-3 rounded-lg active' diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxContextMenu.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxContextMenu.vue index 8156bebbe..4671df3bb 100644 --- a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxContextMenu.vue +++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxContextMenu.vue @@ -1,32 +1,27 @@ - @@ -37,12 +32,14 @@ export default { @close="handleClose" >