gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'parent/main' into kb_development

Browse source
This commit is contained in:
KMY 2024-04-27 08:42:37 +09:00
commit ec7b51504b
42 changed files with 498 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
View file

@ -1,6 +1,6 @@
import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
import WarningIcon from '@/material-icons/400-24px/warning-fill.svg?react';
import GavelIcon from '@/material-icons/400-24px/gavel.svg?react';
import { Icon } from 'mastodon/components/icon';
// This needs to be kept in sync with app/models/account_warning.rb
@ -67,7 +67,7 @@ export const ModerationWarning: React.FC<Props> = ({ action, id, hidden }) => {
rel='noopener noreferrer'
className='notification__moderation-warning'
>
<Icon id='warning' icon={WarningIcon} />
<Icon id='warning' icon={GavelIcon} />
<div className='notification__moderation-warning__content'>
<p>{intl.formatMessage(messages[action])}</p>