Skip to content

[stable5.5] fix: external address color #11680

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
hamza221 merged 1 commit into from
Sep 15, 2025
Merged

[stable5.5] fix: external address color #11680

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
13 changes: 8 additions & 5 deletions src/components/ThreadEnvelope.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
class="app-content-list-item-star icon-important"
:data-starred="isImportant ? 'true' : 'false'"
@click.prevent="hasWriteAcl ? onToggleImportant() : false"
v-html="importantSvg" />

Check warning on line 36 in src/components/ThreadEnvelope.vue

View workflow job for this annotation

GitHub Actions / NPM lint 

'v-html' directive can lead to XSS attack
<IconFavorite v-if="envelope.flags.flagged"
fill-color="#f9cf3d"
:size="18"
Expand All @@ -55,7 +55,7 @@
<div class="envelope__header__left__sender-subject-tags">
<div class="sender">
{{ envelope.from && envelope.from[0] ? envelope.from[0].label : '' }}
<p :class="isInternal?'sender__email':'sender__email sender__external'">
<p class="sender__email" :style="{ 'color': senderEmailColor }">
{{ envelope.from && envelope.from[0] ? envelope.from[0].email : '' }}
</p>
</div>
Expand Down Expand Up @@ -439,6 +439,13 @@
account() {
return this.mainStore.getAccount(this.envelope.accountId)
},
senderEmailColor() {
if (this.isInternal) {
return 'var(--color-text-maxcontrast)'
}

return parseInt(this.mainStore.getNcVersion) >= 32 ? 'var(--color-text-error)' : 'var(--color-error)'
},
from() {
if (!this.message || !this.message.from.length) {
return '?'
Expand Down Expand Up @@ -984,14 +991,10 @@
.sender {
margin-inline-start: calc(var(--default-grid-baseline) * 2);
&__email{
color: var(--color-text-maxcontrast);
text-overflow: ellipsis;
overflow: hidden;
}

&__external{
color: var(--color-error);
}
}

.right {
Expand Down
Loading