diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx index 2a9425b82b3..caa1b757a4b 100644 --- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx +++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx @@ -68,16 +68,18 @@ export default class ColumnSettings extends PureComponent { )} - {alertsEnabled && browserSupport && browserPermission === 'default' && ( - - - - )} -
+ {alertsEnabled && browserSupport && browserPermission === 'default' && ( +
+ + + +
+ )} +

diff --git a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx index 1cdf5b5dfef..276bcbebad0 100644 --- a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx +++ b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx @@ -5,8 +5,8 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; +import SettingsIcon from '@/material-icons/400-20px/settings.svg?react'; import CloseIcon from '@/material-icons/400-24px/close.svg?react'; -import TuneIcon from '@/material-icons/400-24px/tune.svg?react'; import { requestBrowserPermission } from 'mastodon/actions/notifications'; import { changeSetting } from 'mastodon/actions/settings'; import { Button } from 'mastodon/components/button'; @@ -42,7 +42,7 @@ class NotificationsPermissionBanner extends PureComponent {

-

}} />

+

}} />

); diff --git a/app/javascript/material-icons/400-20px/settings-fill.svg b/app/javascript/material-icons/400-20px/settings-fill.svg new file mode 100644 index 00000000000..f5de77821d1 --- /dev/null +++ b/app/javascript/material-icons/400-20px/settings-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-20px/settings.svg b/app/javascript/material-icons/400-20px/settings.svg new file mode 100644 index 00000000000..472569ab6ac --- /dev/null +++ b/app/javascript/material-icons/400-20px/settings.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 71f9e0d9d0b..ff3b72158c4 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -8581,6 +8581,12 @@ noscript { color: $darker-text-color; margin-bottom: 15px; text-align: center; + + .icon { + width: 20px; + height: 20px; + vertical-align: middle; + } } }