diff --git a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx index bf9467bd634..adf58afbf09 100644 --- a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx +++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx @@ -6,8 +6,7 @@ import { Link } from 'react-router-dom'; import { useDispatch, useSelector } from 'react-redux'; - -import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react'; +import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react'; import { fetchNotificationPolicy } from 'mastodon/actions/notifications'; import { Icon } from 'mastodon/components/icon'; import { toCappedNumber } from 'mastodon/utils/numbers'; @@ -34,7 +33,7 @@ export const FilteredNotificationsBanner = () => { return ( <Link className='filtered-notifications-banner' to='/notifications/requests'> - <Icon icon={ArchiveIcon} /> + <Icon icon={InventoryIcon} /> <div className='filtered-notifications-banner__text'> <strong><FormattedMessage id='filtered_notifications_banner.title' defaultMessage='Filtered notifications' /></strong> diff --git a/app/javascript/mastodon/features/notifications/request.jsx b/app/javascript/mastodon/features/notifications/request.jsx index d1f44984406..09bef3beab8 100644 --- a/app/javascript/mastodon/features/notifications/request.jsx +++ b/app/javascript/mastodon/features/notifications/request.jsx @@ -7,8 +7,8 @@ import { Helmet } from 'react-helmet'; import { useSelector, useDispatch } from 'react-redux'; -import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react'; import DoneIcon from '@/material-icons/400-24px/done.svg?react'; +import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react'; import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react'; import { fetchNotificationRequest, fetchNotificationsForRequest, expandNotificationsForRequest, acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/actions/notifications'; import Column from 'mastodon/components/column'; @@ -94,7 +94,7 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => { <Column bindToDocument={!multiColumn} ref={columnRef} label={columnTitle}> <ColumnHeader icon='archive' - iconComponent={ArchiveIcon} + iconComponent={InventoryIcon} title={columnTitle} onClick={handleHeaderClick} multiColumn={multiColumn} diff --git a/app/javascript/mastodon/features/notifications/requests.jsx b/app/javascript/mastodon/features/notifications/requests.jsx index 46e3c428a6e..2d10c6a06c0 100644 --- a/app/javascript/mastodon/features/notifications/requests.jsx +++ b/app/javascript/mastodon/features/notifications/requests.jsx @@ -7,7 +7,7 @@ import { Helmet } from 'react-helmet'; import { useSelector, useDispatch } from 'react-redux'; -import ArchiveIcon from '@/material-icons/400-24px/archive.svg?react'; +import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react'; import { fetchNotificationRequests, expandNotificationRequests } from 'mastodon/actions/notifications'; import Column from 'mastodon/components/column'; import ColumnHeader from 'mastodon/components/column_header'; @@ -43,7 +43,7 @@ export const NotificationRequests = ({ multiColumn }) => { <Column bindToDocument={!multiColumn} ref={columnRef} label={intl.formatMessage(messages.title)}> <ColumnHeader icon='archive' - iconComponent={ArchiveIcon} + iconComponent={InventoryIcon} title={intl.formatMessage(messages.title)} onClick={handleHeaderClick} multiColumn={multiColumn} diff --git a/app/javascript/material-icons/400-24px/archive-fill.svg b/app/javascript/material-icons/400-24px/archive-fill.svg deleted file mode 100644 index bb604288f5b..00000000000 --- a/app/javascript/material-icons/400-24px/archive-fill.svg +++ /dev/null @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m480-240 160-160-56-56-64 64v-168h-80v168l-64-64-56 56 160 160ZM200-120q-33 0-56.5-23.5T120-200v-499q0-14 4.5-27t13.5-24l50-61q11-14 27.5-21.5T250-840h460q18 0 34.5 7.5T772-811l50 61q9 11 13.5 24t4.5 27v499q0 33-23.5 56.5T760-120H200Zm16-600h528l-34-40H250l-34 40Z"/></svg> \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/archive.svg b/app/javascript/material-icons/400-24px/archive.svg deleted file mode 100644 index 6b72fca4ee7..00000000000 --- a/app/javascript/material-icons/400-24px/archive.svg +++ /dev/null @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m480-240 160-160-56-56-64 64v-168h-80v168l-64-64-56 56 160 160ZM200-640v440h560v-440H200Zm0 520q-33 0-56.5-23.5T120-200v-499q0-14 4.5-27t13.5-24l50-61q11-14 27.5-21.5T250-840h460q18 0 34.5 7.5T772-811l50 61q9 11 13.5 24t4.5 27v499q0 33-23.5 56.5T760-120H200Zm16-600h528l-34-40H250l-34 40Zm264 300Z"/></svg> \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/inventory_2-fill.svg b/app/javascript/material-icons/400-24px/inventory_2-fill.svg new file mode 100644 index 00000000000..10ec85da046 --- /dev/null +++ b/app/javascript/material-icons/400-24px/inventory_2-fill.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-80q-33 0-56.5-23.5T120-160v-451q-18-11-29-28.5T80-680v-120q0-33 23.5-56.5T160-880h640q33 0 56.5 23.5T880-800v120q0 23-11 40.5T840-611v451q0 33-23.5 56.5T760-80H200Zm-40-600h640v-120H160v120Zm200 280h240v-80H360v80Z"/></svg> \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/inventory_2.svg b/app/javascript/material-icons/400-24px/inventory_2.svg new file mode 100644 index 00000000000..d00fb1a632c --- /dev/null +++ b/app/javascript/material-icons/400-24px/inventory_2.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-80q-33 0-56.5-23.5T120-160v-451q-18-11-29-28.5T80-680v-120q0-33 23.5-56.5T160-880h640q33 0 56.5 23.5T880-800v120q0 23-11 40.5T840-611v451q0 33-23.5 56.5T760-80H200Zm0-520v440h560v-440H200Zm-40-80h640v-120H160v120Zm200 280h240v-80H360v80Zm120 20Z"/></svg> \ No newline at end of file