Skip to content

fix(darkmode): Fix activity icon colors #7238

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

fix(darkmode): Fix activity icon colors #7238

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
17 changes: 16 additions & 1 deletion src/components/ActivityEntry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<template>
<div v-if="activity" class="activity">
<div class="activity--header">
<img :src="activity.icon" class="activity--icon">
<img :src="activity.icon" class="activity--icon" :class="applyMonochromeIconColor">
<NcRichText class="activity--subject" :text="message.subject" :arguments="message.parameters" />
<div class="activity--timestamp" :name="formatReadableDate(activity.datetime)">
{{ relativeDate(activity.datetime) }}
</div>
</div>
<!-- FIXME ins/del tags do no longer work with activity so we should get rid of that -->
<p v-if="activity.message" class="activity--message" v-html="sanitizedMessage" />

Check warning on line 16 in src/components/ActivityEntry.vue

View workflow job for this annotation

GitHub Actions / NPM lint 

'v-html' directive can lead to XSS attack
</div>
</template>

Expand Down Expand Up @@ -94,6 +94,15 @@
}
},

applyMonochromeIconColor() {
// copied from https://github.com/nextcloud/activity/blob/db919d45c45356082b17104614018e2c7e691996/js/script.js#L225
const monochromeIcon = this.activity.type !== 'file_created' && this.activity.type !== 'file_deleted' && this.activity.type !== 'favorite' && !this.activity.icon.endsWith('-color.svg')
if (monochromeIcon) {
return 'monochrome'
}
return ''
},

sanitizedMessage() {
return DOMPurify.sanitize(this.activity.message, { ALLOWED_TAGS: ['ins', 'del'], ALLOWED_ATTR: ['class'] })
},
Expand All @@ -115,6 +124,12 @@
height: 16px;
flex-shrink: 0;
flex-grow: 0;

/* colored icons, in addition to core ones */
&.monochrome {
opacity: 0.8;
filter: var(--background-invert-if-dark);
}
}
.activity--subject {
margin-left: 10px;
Expand Down
Loading