Skip to content

fix styling of sidebar entries #911

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
szaimen merged 1 commit into from
Sep 7, 2022
Merged

fix styling of sidebar entries #911

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions js/activity-sidebar.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/activity-sidebar.js.map
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 13 additions & 1 deletion src/components/Activity.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<template>
<li class="activity-entry">
<Avatar class="activity-entry__icon"
<Avatar :class="[applyMonochromeIconColor, 'activity-entry__icon', 'activity-icon']"
:disable-menu="true"
:disable-tooltip="true"
:url="activity.icon"
Expand Down Expand Up @@ -106,6 +106,14 @@ export default {
subjectArguments() {
return this.mapRichObjectsToRichArguments(this.activity.subjectRichObjects)
},
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 ''
},
},
created() {
this.updateDateFromNow()
Expand Down Expand Up @@ -204,6 +212,10 @@ export default {
margin-right: 8px;
}

.avatardiv {
background-color: unset !important;
}

&__content {
display: flex;
flex-direction: column;
Expand Down
18 changes: 9 additions & 9 deletions src/tests/__snapshots__/Activity.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`Display correct information for changes 1`] = `
<div>
<li class="activity-entry">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper activity-entry__icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper monochrome activity-entry__icon activity-icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<!---->
<!---->
<!---->
Expand All @@ -28,7 +28,7 @@ exports[`Display correct information for changes 1`] = `
exports[`Display correct information for comments 1`] = `
<div>
<li class="activity-entry">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper activity-entry__icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper monochrome activity-entry__icon activity-icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<!---->
<!---->
<!---->
Expand All @@ -53,7 +53,7 @@ exports[`Display correct information for comments 1`] = `
exports[`Display correct information for creations 1`] = `
<div>
<li class="activity-entry">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper activity-entry__icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper activity-entry__icon activity-icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<!---->
<!---->
<!---->
Expand All @@ -78,7 +78,7 @@ exports[`Display correct information for creations 1`] = `
exports[`Display correct information for favorites 1`] = `
<div>
<li class="activity-entry">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper activity-entry__icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper activity-entry__icon activity-icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<!---->
<!---->
<!---->
Expand All @@ -103,7 +103,7 @@ exports[`Display correct information for favorites 1`] = `
exports[`Display correct information for moves 1`] = `
<div>
<li class="activity-entry">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper activity-entry__icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper monochrome activity-entry__icon activity-icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<!---->
<!---->
<!---->
Expand All @@ -128,7 +128,7 @@ exports[`Display correct information for moves 1`] = `
exports[`Display correct information for renames 1`] = `
<div>
<li class="activity-entry">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper activity-entry__icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper monochrome activity-entry__icon activity-icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<!---->
<!---->
<!---->
Expand All @@ -153,7 +153,7 @@ exports[`Display correct information for renames 1`] = `
exports[`Display correct information for shares 1`] = `
<div>
<li class="activity-entry">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper activity-entry__icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper monochrome activity-entry__icon activity-icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<!---->
<!---->
<!---->
Expand All @@ -178,7 +178,7 @@ exports[`Display correct information for shares 1`] = `
exports[`Display correct information for tags 1`] = `
<div>
<li class="activity-entry">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper activity-entry__icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper monochrome activity-entry__icon activity-icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<!---->
<!---->
<!---->
Expand All @@ -203,7 +203,7 @@ exports[`Display correct information for tags 1`] = `
exports[`Display correct information for unfavorites 1`] = `
<div>
<li class="activity-entry">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper activity-entry__icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<div data-v-27dcfb0b="" aria-label="Avatar of {displayName}" class="avatardiv popovermenu-wrapper monochrome activity-entry__icon activity-icon" style="--size: 15px; line-height: 15px; font-size: 8px; background-color: rgb(0, 130, 201);">
<!---->
<!---->
<!---->
Expand Down