zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Change background color of notifications on private messages (#31657)

This commit is contained in:
Claire 2024-08-30 11:42:48 +02:00 committed by GitHub
parent 35538fe694
commit 3ddeaca863
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
View File

@ -9,7 +9,7 @@ import { navigateToStatus } from 'mastodon/actions/statuses';
import type { IconProp } from 'mastodon/components/icon'; import type { IconProp } from 'mastodon/components/icon';
import { Icon } from 'mastodon/components/icon'; import { Icon } from 'mastodon/components/icon';
import { RelativeTimestamp } from 'mastodon/components/relative_timestamp'; import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
import { useAppDispatch } from 'mastodon/store'; import { useAppSelector, useAppDispatch } from 'mastodon/store';
import { AvatarGroup } from './avatar_group'; import { AvatarGroup } from './avatar_group';
import { DisplayedName } from './displayed_name'; import { DisplayedName } from './displayed_name';
@ -60,6 +60,10 @@ export const NotificationGroupWithStatus: React.FC<{
[labelRenderer, accountIds, count, labelSeeMoreHref], [labelRenderer, accountIds, count, labelSeeMoreHref],
); );
const isPrivateMention = useAppSelector(
(state) => state.statuses.getIn([statusId, 'visibility']) === 'direct',
);
const handlers = useMemo( const handlers = useMemo(
() => ({ () => ({
open: () => { open: () => {
@ -79,7 +83,10 @@ export const NotificationGroupWithStatus: React.FC<{
role='button' role='button'
className={classNames( className={classNames(
`notification-group focusable notification-group--${type}`, `notification-group focusable notification-group--${type}`,
{ 'notification-group--unread': unread }, {
'notification-group--unread': unread,
'notification-group--direct': isPrivateMention,
},
)} )}
tabIndex={0} tabIndex={0}
> >

3
app/javascript/styles/mastodon/components.scss
View File

@ -1626,7 +1626,8 @@ body > [data-popper-placement] {
} }
.status__wrapper-direct, .status__wrapper-direct,
.notification-ungrouped--direct { .notification-ungrouped--direct,
.notification-group--direct {
background: rgba($ui-highlight-color, 0.05); background: rgba($ui-highlight-color, 0.05);
&:focus { &:focus {