From a1920425cac671dd0940897743b1ef7ef36fd266 Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 12 Jan 2024 21:16:48 +0100 Subject: [PATCH] [Glitch] Switch from 48px weight 600 material symbol icons to 24px weight 400 icons Port 6bbcd9348eb9e9afb8b061478f91cfe2ea06b93a to glitch-soc Signed-off-by: Claire --- .../glitch/components/attachment_list.jsx | 4 +-- .../flavours/glitch/components/badge.jsx | 6 ++-- .../glitch/components/column_back_button.tsx | 3 +- .../glitch/components/column_header.jsx | 14 +++++----- .../glitch/components/dismissable_banner.tsx | 3 +- .../flavours/glitch/components/domain.tsx | 2 +- .../glitch/components/dropdown_menu.jsx | 2 +- .../components/edited_timestamp/index.jsx | 2 +- .../flavours/glitch/components/icon.tsx | 3 +- .../flavours/glitch/components/load_gap.tsx | 3 +- .../glitch/components/media_gallery.jsx | 2 +- .../components/notification_purge_buttons.jsx | 4 +-- .../picture_in_picture_placeholder.jsx | 2 +- .../flavours/glitch/components/poll.jsx | 2 +- .../glitch/components/status_action_bar.jsx | 19 ++++++------- .../glitch/components/status_content.jsx | 12 ++++---- .../glitch/components/status_icons.jsx | 18 ++++++------ .../glitch/components/status_prepend.jsx | 14 +++++----- .../glitch/components/verified_badge.tsx | 2 +- .../glitch/components/visibility_icon.tsx | 8 +++--- .../flavours/glitch/features/about/index.jsx | 4 +-- .../account/components/action_bar.jsx | 4 +-- .../components/follow_request_note.jsx | 6 ++-- .../features/account/components/header.jsx | 10 +++---- .../components/profile_column_header.jsx | 2 +- .../account_gallery/components/media_item.jsx | 8 +++--- .../components/moved_note.jsx | 2 +- .../flavours/glitch/features/audio/index.jsx | 13 +++++---- .../flavours/glitch/features/blocks/index.jsx | 3 +- .../features/bookmarked_statuses/index.jsx | 2 +- .../features/community_timeline/index.jsx | 2 +- .../compose/components/action_bar.jsx | 4 +-- .../features/compose/components/header.jsx | 16 +++++------ .../features/compose/components/options.jsx | 17 +++++------ .../features/compose/components/poll_form.jsx | 4 +-- .../compose/components/privacy_dropdown.jsx | 8 +++--- .../features/compose/components/publisher.jsx | 10 +++---- .../compose/components/reply_indicator.jsx | 2 +- .../features/compose/components/search.jsx | 6 ++-- .../compose/components/search_results.jsx | 10 +++---- .../compose/components/textarea_icons.jsx | 6 ++-- .../features/compose/components/upload.jsx | 7 +++-- .../compose/components/upload_progress.jsx | 2 +- .../components/conversation.jsx | 4 +-- .../glitch/features/direct_timeline/index.jsx | 2 +- .../glitch/features/directory/index.jsx | 2 +- .../glitch/features/domain_blocks/index.jsx | 3 +- .../glitch/features/explore/index.jsx | 4 +-- .../glitch/features/explore/results.jsx | 6 ++-- .../features/favourited_statuses/index.jsx | 2 +- .../glitch/features/favourites/index.jsx | 4 +-- .../glitch/features/filters/select_filter.jsx | 2 +- .../glitch/features/firehose/index.jsx | 2 +- .../components/account_authorize.jsx | 4 +-- .../glitch/features/follow_requests/index.jsx | 3 +- .../glitch/features/followed_tags/index.jsx | 2 +- .../components/announcements.jsx | 6 ++-- .../glitch/features/getting_started/index.jsx | 28 +++++++++---------- .../features/getting_started_misc/index.jsx | 14 +++++----- .../features/hashtag_timeline/index.jsx | 2 +- .../glitch/features/home_timeline/index.jsx | 4 +-- .../features/interaction_modal/index.jsx | 8 +++--- .../features/keyboard_shortcuts/index.jsx | 2 +- .../features/list_adder/components/list.jsx | 8 +++--- .../list_editor/components/account.jsx | 4 +-- .../list_editor/components/edit_list_form.jsx | 2 +- .../list_editor/components/search.jsx | 6 ++-- .../glitch/features/list_timeline/index.jsx | 6 ++-- .../flavours/glitch/features/lists/index.jsx | 2 +- .../local_settings/navigation/index.jsx | 14 +++++----- .../flavours/glitch/features/mutes/index.jsx | 3 +- .../notifications/components/admin_report.jsx | 2 +- .../notifications/components/admin_signup.jsx | 2 +- .../components/clear_column_button.jsx | 4 +-- .../notifications/components/filter_bar.jsx | 14 +++++----- .../notifications/components/follow.jsx | 2 +- .../components/follow_request.jsx | 6 ++-- .../notifications_permission_banner.jsx | 4 +-- .../notifications/components/overlay.jsx | 4 +-- .../glitch/features/notifications/index.jsx | 6 ++-- .../features/onboarding/components/step.jsx | 6 ++-- .../glitch/features/onboarding/index.jsx | 10 +++---- .../glitch/features/onboarding/profile.jsx | 4 +-- .../glitch/features/onboarding/share.jsx | 4 +-- .../picture_in_picture/components/footer.jsx | 10 +++---- .../picture_in_picture/components/header.jsx | 2 +- .../glitch/features/pinned_statuses/index.jsx | 4 +-- .../glitch/features/public_timeline/index.jsx | 2 +- .../glitch/features/reblogs/index.jsx | 5 ++-- .../features/report/components/option.jsx | 4 +-- .../features/status/components/action_bar.jsx | 17 ++++++----- .../features/status/components/card.jsx | 6 ++-- .../status/components/detailed_status.jsx | 4 +-- .../flavours/glitch/features/status/index.jsx | 6 ++-- .../subscribed_languages_modal/index.jsx | 2 +- .../features/ui/components/boost_modal.jsx | 2 +- .../ui/components/bundle_modal_error.jsx | 2 +- .../ui/components/compare_history_modal.jsx | 2 +- .../components/deprecated_settings_modal.jsx | 4 +-- .../features/ui/components/embed_modal.jsx | 2 +- .../ui/components/favourite_modal.jsx | 2 +- .../features/ui/components/filter_modal.jsx | 2 +- .../ui/components/focal_point_modal.jsx | 2 +- .../follow_requests_column_link.jsx | 3 +- .../glitch/features/ui/components/header.jsx | 3 +- .../features/ui/components/image_modal.jsx | 3 +- .../features/ui/components/list_panel.jsx | 3 +- .../features/ui/components/media_modal.jsx | 6 ++-- .../ui/components/navigation_panel.jsx | 23 ++++++++------- .../components/notifications_counter_icon.js | 3 +- .../features/ui/components/report_modal.jsx | 3 +- .../features/ui/components/zoomable_image.jsx | 5 ++-- .../flavours/glitch/features/video/index.jsx | 16 +++++------ .../glitch/styles/components/columns.scss | 4 +-- .../glitch/styles/components/drawer.scss | 2 +- .../glitch/styles/components/misc.scss | 6 ++-- .../400-24px/attach_file-fill.svg | 1 + .../material-icons/400-24px/attach_file.svg | 1 + .../material-icons/400-24px/brush-fill.svg | 1 + .../material-icons/400-24px/brush.svg | 1 + .../material-icons/400-24px/chat-fill.svg | 1 + .../material-icons/400-24px/chat.svg | 1 + .../material-icons/400-24px/code-fill.svg | 1 + .../material-icons/400-24px/code.svg | 1 + .../400-24px/expand_less-fill.svg | 1 + .../material-icons/400-24px/expand_less.svg | 1 + .../material-icons/400-24px/forum-fill.svg | 1 + .../material-icons/400-24px/forum.svg | 1 + .../material-icons/400-24px/image-fill.svg | 1 + .../material-icons/400-24px/image.svg | 1 + .../material-icons/400-24px/mail-fill.svg | 1 + .../material-icons/400-24px/mail.svg | 1 + .../400-24px/manufacturing-fill.svg | 1 + .../material-icons/400-24px/manufacturing.svg | 1 + .../material-icons/400-24px/markdown-fill.svg | 1 + .../material-icons/400-24px/markdown.svg | 1 + .../material-icons/400-24px/movie-fill.svg | 1 + .../material-icons/400-24px/movie.svg | 1 + .../400-24px/person_check-fill.svg | 1 + .../material-icons/400-24px/person_check.svg | 1 + .../material-icons/400-24px/trip-fill.svg | 1 + .../material-icons/400-24px/trip.svg | 1 + 142 files changed, 348 insertions(+), 328 deletions(-) create mode 100644 app/javascript/material-icons/400-24px/attach_file-fill.svg create mode 100644 app/javascript/material-icons/400-24px/attach_file.svg create mode 100644 app/javascript/material-icons/400-24px/brush-fill.svg create mode 100644 app/javascript/material-icons/400-24px/brush.svg create mode 100644 app/javascript/material-icons/400-24px/chat-fill.svg create mode 100644 app/javascript/material-icons/400-24px/chat.svg create mode 100644 app/javascript/material-icons/400-24px/code-fill.svg create mode 100644 app/javascript/material-icons/400-24px/code.svg create mode 100644 app/javascript/material-icons/400-24px/expand_less-fill.svg create mode 100644 app/javascript/material-icons/400-24px/expand_less.svg create mode 100644 app/javascript/material-icons/400-24px/forum-fill.svg create mode 100644 app/javascript/material-icons/400-24px/forum.svg create mode 100644 app/javascript/material-icons/400-24px/image-fill.svg create mode 100644 app/javascript/material-icons/400-24px/image.svg create mode 100644 app/javascript/material-icons/400-24px/mail-fill.svg create mode 100644 app/javascript/material-icons/400-24px/mail.svg create mode 100644 app/javascript/material-icons/400-24px/manufacturing-fill.svg create mode 100644 app/javascript/material-icons/400-24px/manufacturing.svg create mode 100644 app/javascript/material-icons/400-24px/markdown-fill.svg create mode 100644 app/javascript/material-icons/400-24px/markdown.svg create mode 100644 app/javascript/material-icons/400-24px/movie-fill.svg create mode 100644 app/javascript/material-icons/400-24px/movie.svg create mode 100644 app/javascript/material-icons/400-24px/person_check-fill.svg create mode 100644 app/javascript/material-icons/400-24px/person_check.svg create mode 100644 app/javascript/material-icons/400-24px/trip-fill.svg create mode 100644 app/javascript/material-icons/400-24px/trip.svg diff --git a/app/javascript/flavours/glitch/components/attachment_list.jsx b/app/javascript/flavours/glitch/components/attachment_list.jsx index 9f4db7161b..6922c414ed 100644 --- a/app/javascript/flavours/glitch/components/attachment_list.jsx +++ b/app/javascript/flavours/glitch/components/attachment_list.jsx @@ -7,9 +7,9 @@ import classNames from 'classnames'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import LinkIcon from '@material-symbols/svg-600/outlined/link.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; +import LinkIcon from 'mastodon/../material-icons/400-24px/link.svg?react'; + const filename = url => url.split('/').pop().split('#')[0].split('?')[0]; diff --git a/app/javascript/flavours/glitch/components/badge.jsx b/app/javascript/flavours/glitch/components/badge.jsx index e716421710..bac8096566 100644 --- a/app/javascript/flavours/glitch/components/badge.jsx +++ b/app/javascript/flavours/glitch/components/badge.jsx @@ -2,9 +2,9 @@ import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; -import GroupsIcon from '@material-symbols/svg-600/outlined/group.svg?react'; -import PersonIcon from '@material-symbols/svg-600/outlined/person.svg?react'; -import SmartToyIcon from '@material-symbols/svg-600/outlined/smart_toy.svg?react'; +import GroupsIcon from 'mastodon/../material-icons/400-24px/group.svg?react'; +import PersonIcon from 'mastodon/../material-icons/400-24px/person.svg?react'; +import SmartToyIcon from 'mastodon/../material-icons/400-24px/smart_toy.svg?react'; export const Badge = ({ icon, label, domain }) => ( diff --git a/app/javascript/flavours/glitch/components/column_back_button.tsx b/app/javascript/flavours/glitch/components/column_back_button.tsx index 9853ba5d9e..5be34e4bba 100644 --- a/app/javascript/flavours/glitch/components/column_back_button.tsx +++ b/app/javascript/flavours/glitch/components/column_back_button.tsx @@ -2,10 +2,9 @@ import { useCallback } from 'react'; import { FormattedMessage } from 'react-intl'; -import ArrowBackIcon from '@material-symbols/svg-600/outlined/arrow_back.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; import { ButtonInTabsBar } from 'flavours/glitch/features/ui/util/columns_context'; +import ArrowBackIcon from 'mastodon/../material-icons/400-24px/arrow_back.svg?react'; import { useAppHistory } from './router'; diff --git a/app/javascript/flavours/glitch/components/column_header.jsx b/app/javascript/flavours/glitch/components/column_header.jsx index eff9605d25..34335a12d9 100644 --- a/app/javascript/flavours/glitch/components/column_header.jsx +++ b/app/javascript/flavours/glitch/components/column_header.jsx @@ -6,16 +6,16 @@ import { FormattedMessage, injectIntl, defineMessages } from 'react-intl'; import classNames from 'classnames'; import { withRouter } from 'react-router-dom'; -import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react'; -import ArrowBackIcon from '@material-symbols/svg-600/outlined/arrow_back.svg?react'; -import ChevronLeftIcon from '@material-symbols/svg-600/outlined/chevron_left.svg?react'; -import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; -import TuneIcon from '@material-symbols/svg-600/outlined/tune.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; import { ButtonInTabsBar, useColumnsContext } from 'flavours/glitch/features/ui/util/columns_context'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react'; +import ArrowBackIcon from 'mastodon/../material-icons/400-24px/arrow_back.svg?react'; +import ChevronLeftIcon from 'mastodon/../material-icons/400-24px/chevron_left.svg?react'; +import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; +import TuneIcon from 'mastodon/../material-icons/400-24px/tune.svg?react'; + import { useAppHistory } from './router'; diff --git a/app/javascript/flavours/glitch/components/dismissable_banner.tsx b/app/javascript/flavours/glitch/components/dismissable_banner.tsx index 3bdd005e13..f2a84f9d7e 100644 --- a/app/javascript/flavours/glitch/components/dismissable_banner.tsx +++ b/app/javascript/flavours/glitch/components/dismissable_banner.tsx @@ -8,11 +8,10 @@ import { useCallback, useState, useEffect } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; - import { changeSetting } from 'flavours/glitch/actions/settings'; import { bannerSettings } from 'flavours/glitch/settings'; import { useAppSelector, useAppDispatch } from 'flavours/glitch/store'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; import { IconButton } from './icon_button'; diff --git a/app/javascript/flavours/glitch/components/domain.tsx b/app/javascript/flavours/glitch/components/domain.tsx index 26cc77604e..637c286ce4 100644 --- a/app/javascript/flavours/glitch/components/domain.tsx +++ b/app/javascript/flavours/glitch/components/domain.tsx @@ -2,7 +2,7 @@ import { useCallback } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import LockOpenIcon from '@material-symbols/svg-600/outlined/lock_open.svg?react'; +import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react'; import { IconButton } from './icon_button'; diff --git a/app/javascript/flavours/glitch/components/dropdown_menu.jsx b/app/javascript/flavours/glitch/components/dropdown_menu.jsx index 25ecc4b5c9..7febdc5ab0 100644 --- a/app/javascript/flavours/glitch/components/dropdown_menu.jsx +++ b/app/javascript/flavours/glitch/components/dropdown_menu.jsx @@ -6,12 +6,12 @@ import { withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; import { supportsPassiveEvents } from 'detect-passive-events'; import Overlay from 'react-overlays/Overlay'; import { CircularProgress } from 'flavours/glitch/components/circular_progress'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; import { IconButton } from './icon_button'; diff --git a/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx b/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx index 4d9bdbd09c..279f0edd48 100644 --- a/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx +++ b/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx @@ -5,12 +5,12 @@ import { FormattedMessage, injectIntl } from 'react-intl'; import { connect } from 'react-redux'; -import ArrowDropDownIcon from '@material-symbols/svg-600/outlined/arrow_drop_down.svg?react'; import { openModal } from 'flavours/glitch/actions/modal'; import { Icon } from 'flavours/glitch/components/icon'; import InlineAccount from 'flavours/glitch/components/inline_account'; import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp'; +import ArrowDropDownIcon from 'mastodon/../material-icons/400-24px/arrow_drop_down.svg?react'; import DropdownMenu from './containers/dropdown_menu_container'; diff --git a/app/javascript/flavours/glitch/components/icon.tsx b/app/javascript/flavours/glitch/components/icon.tsx index ca095d203e..c81e8d14e5 100644 --- a/app/javascript/flavours/glitch/components/icon.tsx +++ b/app/javascript/flavours/glitch/components/icon.tsx @@ -1,8 +1,7 @@ import classNames from 'classnames'; -import CheckBoxOutlineBlankIcon from '@material-symbols/svg-600/outlined/check_box_outline_blank.svg?react'; - import { isProduction } from 'flavours/glitch/utils/environment'; +import CheckBoxOutlineBlankIcon from 'mastodon/../material-icons/400-24px/check_box_outline_blank.svg?react'; interface SVGPropsWithTitle extends React.SVGProps { title?: string; diff --git a/app/javascript/flavours/glitch/components/load_gap.tsx b/app/javascript/flavours/glitch/components/load_gap.tsx index ae41ff0a7d..64e930d692 100644 --- a/app/javascript/flavours/glitch/components/load_gap.tsx +++ b/app/javascript/flavours/glitch/components/load_gap.tsx @@ -2,9 +2,8 @@ import { useCallback } from 'react'; import { useIntl, defineMessages } from 'react-intl'; -import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; +import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react'; const messages = defineMessages({ load_more: { id: 'status.load_more', defaultMessage: 'Load more' }, diff --git a/app/javascript/flavours/glitch/components/media_gallery.jsx b/app/javascript/flavours/glitch/components/media_gallery.jsx index 6d13a89c86..ea6b709b0a 100644 --- a/app/javascript/flavours/glitch/components/media_gallery.jsx +++ b/app/javascript/flavours/glitch/components/media_gallery.jsx @@ -8,10 +8,10 @@ import classNames from 'classnames'; import { is } from 'immutable'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react'; import { debounce } from 'lodash'; import { Blurhash } from 'flavours/glitch/components/blurhash'; +import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react'; import { autoPlayGif, displayMedia, useBlurhash } from '../initial_state'; diff --git a/app/javascript/flavours/glitch/components/notification_purge_buttons.jsx b/app/javascript/flavours/glitch/components/notification_purge_buttons.jsx index bae5061a61..7cd9886560 100644 --- a/app/javascript/flavours/glitch/components/notification_purge_buttons.jsx +++ b/app/javascript/flavours/glitch/components/notification_purge_buttons.jsx @@ -12,9 +12,9 @@ import classNames from 'classnames'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import DeleteIcon from '@material-symbols/svg-600/outlined/delete.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; +import DeleteIcon from 'mastodon/../material-icons/400-24px/delete.svg?react'; + const messages = defineMessages({ btnAll : { id: 'notification_purge.btn_all', defaultMessage: 'Select\nall' }, diff --git a/app/javascript/flavours/glitch/components/picture_in_picture_placeholder.jsx b/app/javascript/flavours/glitch/components/picture_in_picture_placeholder.jsx index d47acd7c0a..2c52397e56 100644 --- a/app/javascript/flavours/glitch/components/picture_in_picture_placeholder.jsx +++ b/app/javascript/flavours/glitch/components/picture_in_picture_placeholder.jsx @@ -5,10 +5,10 @@ import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; -import CancelPresentationIcon from '@material-symbols/svg-600/outlined/cancel_presentation.svg?react'; import { removePictureInPicture } from 'flavours/glitch/actions/picture_in_picture'; import { Icon } from 'flavours/glitch/components/icon'; +import CancelPresentationIcon from 'mastodon/../material-icons/400-24px/cancel_presentation.svg?react'; class PictureInPicturePlaceholder extends PureComponent { diff --git a/app/javascript/flavours/glitch/components/poll.jsx b/app/javascript/flavours/glitch/components/poll.jsx index 4511629adb..4c15e9e4da 100644 --- a/app/javascript/flavours/glitch/components/poll.jsx +++ b/app/javascript/flavours/glitch/components/poll.jsx @@ -7,13 +7,13 @@ import classNames from 'classnames'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react'; import escapeTextContentForBrowser from 'escape-html'; import spring from 'react-motion/lib/spring'; import { Icon } from 'flavours/glitch/components/icon'; import emojify from 'flavours/glitch/features/emoji/emoji'; import Motion from 'flavours/glitch/features/ui/util/optional_motion'; +import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react'; import { RelativeTimestamp } from './relative_timestamp'; diff --git a/app/javascript/flavours/glitch/components/status_action_bar.jsx b/app/javascript/flavours/glitch/components/status_action_bar.jsx index 3310b356b8..076978b6ab 100644 --- a/app/javascript/flavours/glitch/components/status_action_bar.jsx +++ b/app/javascript/flavours/glitch/components/status_action_bar.jsx @@ -8,19 +8,18 @@ import { withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import BookmarkIcon from '@material-symbols/svg-600/outlined/bookmark-fill.svg?react'; -import BookmarkBorderIcon from '@material-symbols/svg-600/outlined/bookmark.svg?react'; -import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react'; -import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react'; -import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react'; -import ReplyAllIcon from '@material-symbols/svg-600/outlined/reply_all.svg?react'; -import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react'; -import StarBorderIcon from '@material-symbols/svg-600/outlined/star.svg?react'; -import VisibilityIcon from '@material-symbols/svg-600/outlined/visibility.svg?react'; - import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'flavours/glitch/permissions'; import { accountAdminLink, statusAdminLink } from 'flavours/glitch/utils/backend_links'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg?react'; +import BookmarkBorderIcon from 'mastodon/../material-icons/400-24px/bookmark.svg?react'; +import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react'; +import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react'; +import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react'; +import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react'; +import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react'; +import StarBorderIcon from 'mastodon/../material-icons/400-24px/star.svg?react'; +import VisibilityIcon from 'mastodon/../material-icons/400-24px/visibility.svg?react'; import RepeatDisabledIcon from 'mastodon/../svg-icons/repeat_disabled.svg'; import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg'; diff --git a/app/javascript/flavours/glitch/components/status_content.jsx b/app/javascript/flavours/glitch/components/status_content.jsx index 9a8c018384..3beb27d3c1 100644 --- a/app/javascript/flavours/glitch/components/status_content.jsx +++ b/app/javascript/flavours/glitch/components/status_content.jsx @@ -9,15 +9,15 @@ import { withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { connect } from 'react-redux'; -import ImageIcon from '@material-symbols/svg-600/outlined/image.svg?react'; -import InsertChartIcon from '@material-symbols/svg-600/outlined/insert_chart.svg?react'; -import LinkIcon from '@material-symbols/svg-600/outlined/link.svg?react'; -import MovieIcon from '@material-symbols/svg-600/outlined/movie.svg?react'; -import MusicNoteIcon from '@material-symbols/svg-600/outlined/music_note.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; import { autoPlayGif, languages as preloadedLanguages } from 'flavours/glitch/initial_state'; import { decode as decodeIDNA } from 'flavours/glitch/utils/idna'; +import ImageIcon from 'mastodon/../material-icons/400-24px/image.svg?react'; +import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react'; +import LinkIcon from 'mastodon/../material-icons/400-24px/link.svg?react'; +import MovieIcon from 'mastodon/../material-icons/400-24px/movie.svg?react'; +import MusicNoteIcon from 'mastodon/../material-icons/400-24px/music_note.svg?react'; + import { Permalink } from './permalink'; diff --git a/app/javascript/flavours/glitch/components/status_icons.jsx b/app/javascript/flavours/glitch/components/status_icons.jsx index ed808f3666..c53d80a33d 100644 --- a/app/javascript/flavours/glitch/components/status_icons.jsx +++ b/app/javascript/flavours/glitch/components/status_icons.jsx @@ -6,17 +6,17 @@ import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import ExpandLessIcon from '@material-symbols/svg-600/outlined/expand_less.svg?react'; -import ForumIcon from '@material-symbols/svg-600/outlined/forum.svg?react'; -import HomeIcon from '@material-symbols/svg-600/outlined/home.svg?react'; -import ImageIcon from '@material-symbols/svg-600/outlined/image.svg?react'; -import InsertChartIcon from '@material-symbols/svg-600/outlined/insert_chart.svg?react'; -import LinkIcon from '@material-symbols/svg-600/outlined/link.svg?react'; -import MovieIcon from '@material-symbols/svg-600/outlined/movie.svg?react'; -import MusicNoteIcon from '@material-symbols/svg-600/outlined/music_note.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; import { languages } from 'flavours/glitch/initial_state'; +import ExpandLessIcon from 'mastodon/../material-icons/400-24px/expand_less.svg?react'; +import ForumIcon from 'mastodon/../material-icons/400-24px/forum.svg?react'; +import HomeIcon from 'mastodon/../material-icons/400-24px/home.svg?react'; +import ImageIcon from 'mastodon/../material-icons/400-24px/image.svg?react'; +import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react'; +import LinkIcon from 'mastodon/../material-icons/400-24px/link.svg?react'; +import MovieIcon from 'mastodon/../material-icons/400-24px/movie.svg?react'; +import MusicNoteIcon from 'mastodon/../material-icons/400-24px/music_note.svg?react'; + import { IconButton } from './icon_button'; import { VisibilityIcon } from './visibility_icon'; diff --git a/app/javascript/flavours/glitch/components/status_prepend.jsx b/app/javascript/flavours/glitch/components/status_prepend.jsx index 411043284f..44775cb3a5 100644 --- a/app/javascript/flavours/glitch/components/status_prepend.jsx +++ b/app/javascript/flavours/glitch/components/status_prepend.jsx @@ -6,15 +6,15 @@ import { FormattedMessage } from 'react-intl'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react'; -import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react'; -import InsertChartIcon from '@material-symbols/svg-600/outlined/insert_chart.svg?react'; -import PushPinIcon from '@material-symbols/svg-600/outlined/push_pin.svg?react'; -import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react'; -import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; import { me } from 'flavours/glitch/initial_state'; +import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react'; +import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react'; +import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react'; +import PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.svg?react'; +import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react'; +import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react'; + export default class StatusPrepend extends PureComponent { diff --git a/app/javascript/flavours/glitch/components/verified_badge.tsx b/app/javascript/flavours/glitch/components/verified_badge.tsx index add7c7acdf..4209f68319 100644 --- a/app/javascript/flavours/glitch/components/verified_badge.tsx +++ b/app/javascript/flavours/glitch/components/verified_badge.tsx @@ -1,4 +1,4 @@ -import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react'; +import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react'; import { Icon } from './icon'; diff --git a/app/javascript/flavours/glitch/components/visibility_icon.tsx b/app/javascript/flavours/glitch/components/visibility_icon.tsx index 132d31f5bd..295853dce4 100644 --- a/app/javascript/flavours/glitch/components/visibility_icon.tsx +++ b/app/javascript/flavours/glitch/components/visibility_icon.tsx @@ -1,9 +1,9 @@ import { defineMessages, useIntl } from 'react-intl'; -import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react'; -import LockOpenIcon from '@material-symbols/svg-600/outlined/lock_open.svg?react'; -import MailIcon from '@material-symbols/svg-600/outlined/mail.svg?react'; -import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react'; +import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react'; +import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react'; +import MailIcon from 'mastodon/../material-icons/400-24px/mail.svg?react'; +import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react'; import { Icon } from './icon'; diff --git a/app/javascript/flavours/glitch/features/about/index.jsx b/app/javascript/flavours/glitch/features/about/index.jsx index ea923acbc0..41dcc6433d 100644 --- a/app/javascript/flavours/glitch/features/about/index.jsx +++ b/app/javascript/flavours/glitch/features/about/index.jsx @@ -10,8 +10,6 @@ import { List as ImmutableList } from 'immutable'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { connect } from 'react-redux'; -import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react'; -import ExpandMoreIcon from '@material-symbols/svg-600/outlined/expand_more.svg?react'; import { fetchServer, fetchExtendedDescription, fetchDomainBlocks } from 'flavours/glitch/actions/server'; import Column from 'flavours/glitch/components/column'; @@ -20,6 +18,8 @@ import { ServerHeroImage } from 'flavours/glitch/components/server_hero_image'; import { Skeleton } from 'flavours/glitch/components/skeleton'; import Account from 'flavours/glitch/containers/account_container'; import LinkFooter from 'flavours/glitch/features/ui/components/link_footer'; +import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react'; +import ExpandMoreIcon from 'mastodon/../material-icons/400-24px/expand_more.svg?react'; const messages = defineMessages({ title: { id: 'column.about', defaultMessage: 'About' }, diff --git a/app/javascript/flavours/glitch/features/account/components/action_bar.jsx b/app/javascript/flavours/glitch/features/account/components/action_bar.jsx index 647916c06e..c50e99bab9 100644 --- a/app/javascript/flavours/glitch/features/account/components/action_bar.jsx +++ b/app/javascript/flavours/glitch/features/account/components/action_bar.jsx @@ -6,9 +6,9 @@ import { NavLink } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import InfoIcon from '@material-symbols/svg-600/outlined/info.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; +import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react'; + class ActionBar extends PureComponent { diff --git a/app/javascript/flavours/glitch/features/account/components/follow_request_note.jsx b/app/javascript/flavours/glitch/features/account/components/follow_request_note.jsx index 294aa517b4..c765fda5b3 100644 --- a/app/javascript/flavours/glitch/features/account/components/follow_request_note.jsx +++ b/app/javascript/flavours/glitch/features/account/components/follow_request_note.jsx @@ -3,10 +3,10 @@ import { FormattedMessage } from 'react-intl'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; +import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; + export default class FollowRequestNote extends ImmutablePureComponent { diff --git a/app/javascript/flavours/glitch/features/account/components/header.jsx b/app/javascript/flavours/glitch/features/account/components/header.jsx index bbb5944509..f92da02340 100644 --- a/app/javascript/flavours/glitch/features/account/components/header.jsx +++ b/app/javascript/flavours/glitch/features/account/components/header.jsx @@ -9,11 +9,6 @@ import { withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react'; -import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react'; -import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react'; -import NotificationsIcon from '@material-symbols/svg-600/outlined/notifications.svg?react'; -import NotificationsActiveIcon from '@material-symbols/svg-600/outlined/notifications_active-fill.svg?react'; import { Avatar } from 'flavours/glitch/components/avatar'; import { Badge, AutomatedBadge, GroupBadge } from 'flavours/glitch/components/badge'; @@ -25,6 +20,11 @@ import { autoPlayGif, me, domain } from 'flavours/glitch/initial_state'; import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'flavours/glitch/permissions'; import { preferencesLink, profileLink, accountAdminLink } from 'flavours/glitch/utils/backend_links'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react'; +import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react'; +import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react'; +import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications.svg?react'; +import NotificationsActiveIcon from 'mastodon/../material-icons/400-24px/notifications_active-fill.svg?react'; import AccountNoteContainer from '../containers/account_note_container'; import FollowRequestNoteContainer from '../containers/follow_request_note_container'; diff --git a/app/javascript/flavours/glitch/features/account/components/profile_column_header.jsx b/app/javascript/flavours/glitch/features/account/components/profile_column_header.jsx index 46bf15ab71..90929f5802 100644 --- a/app/javascript/flavours/glitch/features/account/components/profile_column_header.jsx +++ b/app/javascript/flavours/glitch/features/account/components/profile_column_header.jsx @@ -3,7 +3,7 @@ import { PureComponent } from 'react'; import { injectIntl, defineMessages } from 'react-intl'; -import PersonIcon from '@material-symbols/svg-600/outlined/person.svg?react'; +import PersonIcon from 'mastodon/../material-icons/400-24px/person.svg?react'; import ColumnHeader from '../../../components/column_header'; diff --git a/app/javascript/flavours/glitch/features/account_gallery/components/media_item.jsx b/app/javascript/flavours/glitch/features/account_gallery/components/media_item.jsx index 1154fa49c8..2c34f7a7a4 100644 --- a/app/javascript/flavours/glitch/features/account_gallery/components/media_item.jsx +++ b/app/javascript/flavours/glitch/features/account_gallery/components/media_item.jsx @@ -5,13 +5,13 @@ import classNames from 'classnames'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import AudiotrackIcon from '@material-symbols/svg-600/outlined/music_note.svg?react'; -import PlayArrowIcon from '@material-symbols/svg-600/outlined/play_arrow.svg?react'; -import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react'; - import { Blurhash } from 'flavours/glitch/components/blurhash'; import { Icon } from 'flavours/glitch/components/icon'; import { autoPlayGif, displayMedia, useBlurhash } from 'flavours/glitch/initial_state'; +import AudiotrackIcon from 'mastodon/../material-icons/400-24px/music_note.svg?react'; +import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow.svg?react'; +import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react'; + export default class MediaItem extends ImmutablePureComponent { diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx b/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx index 13fde6a05d..144c227f1b 100644 --- a/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx +++ b/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx @@ -5,10 +5,10 @@ import { withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import TripIcon from '@material-symbols/svg-600/outlined/trip.svg?react'; import { Icon } from 'flavours/glitch/components/icon'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import TripIcon from 'mastodon/../material-icons/400-24px/trip.svg?react'; import { AvatarOverlay } from '../../../components/avatar_overlay'; import { DisplayName } from '../../../components/display_name'; diff --git a/app/javascript/flavours/glitch/features/audio/index.jsx b/app/javascript/flavours/glitch/features/audio/index.jsx index d94e2fec70..19fad43a23 100644 --- a/app/javascript/flavours/glitch/features/audio/index.jsx +++ b/app/javascript/flavours/glitch/features/audio/index.jsx @@ -7,16 +7,17 @@ import classNames from 'classnames'; import { is } from 'immutable'; -import DownloadIcon from '@material-symbols/svg-600/outlined/download.svg?react'; -import PauseIcon from '@material-symbols/svg-600/outlined/pause.svg?react'; -import PlayArrowIcon from '@material-symbols/svg-600/outlined/play_arrow-fill.svg?react'; -import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react'; -import VolumeOffIcon from '@material-symbols/svg-600/outlined/volume_off-fill.svg?react'; -import VolumeUpIcon from '@material-symbols/svg-600/outlined/volume_up-fill.svg?react'; import { throttle, debounce } from 'lodash'; import { Icon } from 'flavours/glitch/components/icon'; import { formatTime, getPointerPosition, fileNameFromURL } from 'flavours/glitch/features/video'; +import DownloadIcon from 'mastodon/../material-icons/400-24px/download.svg?react'; +import PauseIcon from 'mastodon/../material-icons/400-24px/pause.svg?react'; +import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow-fill.svg?react'; +import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react'; +import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off-fill.svg?react'; +import VolumeUpIcon from 'mastodon/../material-icons/400-24px/volume_up-fill.svg?react'; + import { Blurhash } from '../../components/blurhash'; import { displayMedia, useBlurhash } from '../../initial_state'; diff --git a/app/javascript/flavours/glitch/features/blocks/index.jsx b/app/javascript/flavours/glitch/features/blocks/index.jsx index 7e1eda8aca..656784664f 100644 --- a/app/javascript/flavours/glitch/features/blocks/index.jsx +++ b/app/javascript/flavours/glitch/features/blocks/index.jsx @@ -6,9 +6,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import BlockIcon from '@material-symbols/svg-600/outlined/block-fill.svg?react'; import { debounce } from 'lodash'; +import BlockIcon from 'mastodon/../material-icons/400-24px/block-fill.svg?react'; + import { fetchBlocks, expandBlocks } from '../../actions/blocks'; import { LoadingIndicator } from '../../components/loading_indicator'; import ScrollableList from '../../components/scrollable_list'; diff --git a/app/javascript/flavours/glitch/features/bookmarked_statuses/index.jsx b/app/javascript/flavours/glitch/features/bookmarked_statuses/index.jsx index 7a727d0b10..0f1566d965 100644 --- a/app/javascript/flavours/glitch/features/bookmarked_statuses/index.jsx +++ b/app/javascript/flavours/glitch/features/bookmarked_statuses/index.jsx @@ -8,7 +8,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import BookmarksIcon from '@material-symbols/svg-600/outlined/bookmarks-fill.svg?react'; import { debounce } from 'lodash'; import { fetchBookmarkedStatuses, expandBookmarkedStatuses } from 'flavours/glitch/actions/bookmarks'; @@ -17,6 +16,7 @@ import ColumnHeader from 'flavours/glitch/components/column_header'; import StatusList from 'flavours/glitch/components/status_list'; import Column from 'flavours/glitch/features/ui/components/column'; import { getStatusList } from 'flavours/glitch/selectors'; +import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react'; const messages = defineMessages({ heading: { id: 'column.bookmarks', defaultMessage: 'Bookmarks' }, diff --git a/app/javascript/flavours/glitch/features/community_timeline/index.jsx b/app/javascript/flavours/glitch/features/community_timeline/index.jsx index dc1650a3b0..f2158d11b3 100644 --- a/app/javascript/flavours/glitch/features/community_timeline/index.jsx +++ b/app/javascript/flavours/glitch/features/community_timeline/index.jsx @@ -7,10 +7,10 @@ import { Helmet } from 'react-helmet'; import { connect } from 'react-redux'; -import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react'; import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner'; import { domain } from 'flavours/glitch/initial_state'; +import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react'; import { addColumn, removeColumn, moveColumn } from '../../actions/columns'; import { connectCommunityStream } from '../../actions/streaming'; diff --git a/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx b/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx index 9467522ca6..fc498ca5a6 100644 --- a/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx @@ -5,9 +5,9 @@ import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import MenuIcon from '@material-symbols/svg-600/outlined/menu.svg?react'; - import { preferencesLink, profileLink } from 'flavours/glitch/utils/backend_links'; +import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react'; + import DropdownMenuContainer from '../../../containers/dropdown_menu_container'; diff --git a/app/javascript/flavours/glitch/features/compose/components/header.jsx b/app/javascript/flavours/glitch/features/compose/components/header.jsx index 0fc76b960f..f83cb694d4 100644 --- a/app/javascript/flavours/glitch/features/compose/components/header.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/header.jsx @@ -7,17 +7,17 @@ import { Link } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react'; -import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react'; -import LogoutIcon from '@material-symbols/svg-600/outlined/logout.svg?react'; -import ManufacturingIcon from '@material-symbols/svg-600/outlined/manufacturing.svg?react'; -import MenuIcon from '@material-symbols/svg-600/outlined/menu.svg?react'; -import NotificationsIcon from '@material-symbols/svg-600/outlined/notifications-fill.svg?react'; -import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; import { signOutLink } from 'flavours/glitch/utils/backend_links'; import { conditionalRender } from 'flavours/glitch/utils/react_helpers'; +import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react'; +import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react'; +import LogoutIcon from 'mastodon/../material-icons/400-24px/logout.svg?react'; +import ManufacturingIcon from 'mastodon/../material-icons/400-24px/manufacturing.svg?react'; +import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react'; +import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications-fill.svg?react'; +import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react'; + const messages = defineMessages({ community: { diff --git a/app/javascript/flavours/glitch/features/compose/components/options.jsx b/app/javascript/flavours/glitch/features/compose/components/options.jsx index 022817cfdd..0430e50c14 100644 --- a/app/javascript/flavours/glitch/features/compose/components/options.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/options.jsx @@ -6,18 +6,19 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import AttachFileIcon from '@material-symbols/svg-600/outlined/attach_file.svg?react'; -import BrushIcon from '@material-symbols/svg-600/outlined/brush.svg?react'; -import CodeIcon from '@material-symbols/svg-600/outlined/code.svg?react'; -import DescriptionIcon from '@material-symbols/svg-600/outlined/description.svg?react'; -import InsertChartIcon from '@material-symbols/svg-600/outlined/insert_chart.svg?react'; -import MarkdownIcon from '@material-symbols/svg-600/outlined/markdown.svg?react'; -import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react'; -import UploadFileIcon from '@material-symbols/svg-600/outlined/upload_file.svg?react'; import Toggle from 'react-toggle'; import { IconButton } from 'flavours/glitch/components/icon_button'; import { pollLimits } from 'flavours/glitch/initial_state'; +import AttachFileIcon from 'mastodon/../material-icons/400-24px/attach_file.svg?react'; +import BrushIcon from 'mastodon/../material-icons/400-24px/brush.svg?react'; +import CodeIcon from 'mastodon/../material-icons/400-24px/code.svg?react'; +import DescriptionIcon from 'mastodon/../material-icons/400-24px/description.svg?react'; +import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react'; +import MarkdownIcon from 'mastodon/../material-icons/400-24px/markdown.svg?react'; +import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react'; +import UploadFileIcon from 'mastodon/../material-icons/400-24px/upload_file.svg?react'; + import DropdownContainer from '../containers/dropdown_container'; import LanguageDropdown from '../containers/language_dropdown_container'; diff --git a/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx b/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx index 25c8c0e5a0..bebe7191ac 100644 --- a/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx @@ -8,13 +8,13 @@ import classNames from 'classnames'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; import AutosuggestInput from 'flavours/glitch/components/autosuggest_input'; import { Icon } from 'flavours/glitch/components/icon'; import { IconButton } from 'flavours/glitch/components/icon_button'; import { pollLimits } from 'flavours/glitch/initial_state'; +import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; const messages = defineMessages({ option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Choice {number}' }, diff --git a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx index c95324ed2b..b5d7c74abd 100644 --- a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx @@ -3,10 +3,10 @@ import { PureComponent } from 'react'; import { injectIntl, defineMessages } from 'react-intl'; -import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react'; -import LockOpenIcon from '@material-symbols/svg-600/outlined/lock_open.svg?react'; -import MailIcon from '@material-symbols/svg-600/outlined/mail.svg?react'; -import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react'; +import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react'; +import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react'; +import MailIcon from 'mastodon/../material-icons/400-24px/mail.svg?react'; +import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react'; import Dropdown from './dropdown'; diff --git a/app/javascript/flavours/glitch/features/compose/components/publisher.jsx b/app/javascript/flavours/glitch/features/compose/components/publisher.jsx index 523614217f..239f8cea3f 100644 --- a/app/javascript/flavours/glitch/features/compose/components/publisher.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/publisher.jsx @@ -4,13 +4,13 @@ import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react'; -import LockOpenIcon from '@material-symbols/svg-600/outlined/lock_open.svg?react'; -import MailIcon from '@material-symbols/svg-600/outlined/mail.svg?react'; -import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react'; - import { Button } from 'flavours/glitch/components/button'; import { Icon } from 'flavours/glitch/components/icon'; +import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react'; +import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react'; +import MailIcon from 'mastodon/../material-icons/400-24px/mail.svg?react'; +import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react'; + const messages = defineMessages({ publish: { diff --git a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx index 3bc2f1ab2a..9cb446b357 100644 --- a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx @@ -5,10 +5,10 @@ import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; import AttachmentList from 'flavours/glitch/components/attachment_list'; import { WithOptionalRouterPropTypes, withOptionalRouter } from 'flavours/glitch/utils/react_router'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; import { Avatar } from '../../../components/avatar'; import { DisplayName } from '../../../components/display_name'; diff --git a/app/javascript/flavours/glitch/features/compose/components/search.jsx b/app/javascript/flavours/glitch/features/compose/components/search.jsx index c91dbd9b06..d94d764c9c 100644 --- a/app/javascript/flavours/glitch/features/compose/components/search.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/search.jsx @@ -8,14 +8,14 @@ import { withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import CancelIcon from '@material-symbols/svg-600/outlined/cancel-fill.svg?react'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; -import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react'; import { Icon } from 'flavours/glitch/components/icon'; import { domain, searchEnabled } from 'flavours/glitch/initial_state'; import { HASHTAG_REGEX } from 'flavours/glitch/utils/hashtags'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import CancelIcon from 'mastodon/../material-icons/400-24px/cancel-fill.svg?react'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; +import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react'; const messages = defineMessages({ placeholder: { id: 'search.placeholder', defaultMessage: 'Search' }, diff --git a/app/javascript/flavours/glitch/features/compose/components/search_results.jsx b/app/javascript/flavours/glitch/features/compose/components/search_results.jsx index 96597cc726..8c19946bf1 100644 --- a/app/javascript/flavours/glitch/features/compose/components/search_results.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/search_results.jsx @@ -5,14 +5,14 @@ import { FormattedMessage } from 'react-intl'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import FindInPageIcon from '@material-symbols/svg-600/outlined/find_in_page.svg?react'; -import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react'; -import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react'; -import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; import { LoadMore } from 'flavours/glitch/components/load_more'; import { SearchSection } from 'flavours/glitch/features/explore/components/search_section'; +import FindInPageIcon from 'mastodon/../material-icons/400-24px/find_in_page.svg?react'; +import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react'; +import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react'; +import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react'; + import { ImmutableHashtag as Hashtag } from '../../../components/hashtag'; import AccountContainer from '../../../containers/account_container'; diff --git a/app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx b/app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx index 8f1629601e..ee0d5b23b6 100644 --- a/app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx @@ -5,10 +5,10 @@ import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import ForumIcon from '@material-symbols/svg-600/outlined/forum.svg?react'; -import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; +import ForumIcon from 'mastodon/../material-icons/400-24px/forum.svg?react'; +import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react'; + const messages = defineMessages({ localOnly: { diff --git a/app/javascript/flavours/glitch/features/compose/components/upload.jsx b/app/javascript/flavours/glitch/features/compose/components/upload.jsx index 2d3488f84b..dc60cc7723 100644 --- a/app/javascript/flavours/glitch/features/compose/components/upload.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/upload.jsx @@ -5,12 +5,13 @@ import { FormattedMessage } from 'react-intl'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; -import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react'; -import InfoIcon from '@material-symbols/svg-600/outlined/info.svg?react'; import spring from 'react-motion/lib/spring'; import { Icon } from 'flavours/glitch/components/icon'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; +import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react'; +import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react'; + import Motion from '../../ui/util/optional_motion'; diff --git a/app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx b/app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx index 72dd15a9ae..214015c3f0 100644 --- a/app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/upload_progress.jsx @@ -3,10 +3,10 @@ import { PureComponent } from 'react'; import { FormattedMessage } from 'react-intl'; -import UploadFileIcon from '@material-symbols/svg-600/outlined/upload_file.svg?react'; import spring from 'react-motion/lib/spring'; import { Icon } from 'flavours/glitch/components/icon'; +import UploadFileIcon from 'mastodon/../material-icons/400-24px/upload_file.svg?react'; import Motion from '../../ui/util/optional_motion'; diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx index 6c479f5a87..0720aaac1d 100644 --- a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx +++ b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx @@ -8,8 +8,6 @@ import { withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react'; -import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react'; import { HotKeys } from 'react-hotkeys'; import AttachmentList from 'flavours/glitch/components/attachment_list'; @@ -21,6 +19,8 @@ import StatusContent from 'flavours/glitch/components/status_content'; import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container'; import { autoPlayGif } from 'flavours/glitch/initial_state'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react'; +import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react'; const messages = defineMessages({ more: { id: 'status.more', defaultMessage: 'More' }, diff --git a/app/javascript/flavours/glitch/features/direct_timeline/index.jsx b/app/javascript/flavours/glitch/features/direct_timeline/index.jsx index 39eb761864..fbb40a4b6e 100644 --- a/app/javascript/flavours/glitch/features/direct_timeline/index.jsx +++ b/app/javascript/flavours/glitch/features/direct_timeline/index.jsx @@ -7,7 +7,6 @@ import { Helmet } from 'react-helmet'; import { connect } from 'react-redux'; -import MailIcon from '@material-symbols/svg-600/outlined/mail.svg?react'; import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns'; import { mountConversations, unmountConversations, expandConversations } from 'flavours/glitch/actions/conversations'; @@ -16,6 +15,7 @@ import { expandDirectTimeline } from 'flavours/glitch/actions/timelines'; import Column from 'flavours/glitch/components/column'; import ColumnHeader from 'flavours/glitch/components/column_header'; import StatusListContainer from 'flavours/glitch/features/ui/containers/status_list_container'; +import MailIcon from 'mastodon/../material-icons/400-24px/mail.svg?react'; import ColumnSettingsContainer from './containers/column_settings_container'; import ConversationsListContainer from './containers/conversations_list_container'; diff --git a/app/javascript/flavours/glitch/features/directory/index.jsx b/app/javascript/flavours/glitch/features/directory/index.jsx index 5579bfc597..55ff5b5c9f 100644 --- a/app/javascript/flavours/glitch/features/directory/index.jsx +++ b/app/javascript/flavours/glitch/features/directory/index.jsx @@ -9,7 +9,6 @@ import { List as ImmutableList } from 'immutable'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { connect } from 'react-redux'; -import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react'; import { addColumn, removeColumn, moveColumn, changeColumnParams } from 'flavours/glitch/actions/columns'; import { fetchDirectory, expandDirectory } from 'flavours/glitch/actions/directory'; @@ -19,6 +18,7 @@ import { LoadMore } from 'flavours/glitch/components/load_more'; import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator'; import { RadioButton } from 'flavours/glitch/components/radio_button'; import ScrollContainer from 'flavours/glitch/containers/scroll_container'; +import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react'; import AccountCard from './components/account_card'; diff --git a/app/javascript/flavours/glitch/features/domain_blocks/index.jsx b/app/javascript/flavours/glitch/features/domain_blocks/index.jsx index 7a57ea1262..5c9b70f02b 100644 --- a/app/javascript/flavours/glitch/features/domain_blocks/index.jsx +++ b/app/javascript/flavours/glitch/features/domain_blocks/index.jsx @@ -8,9 +8,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import BlockIcon from '@material-symbols/svg-600/outlined/block-fill.svg?react'; import { debounce } from 'lodash'; +import BlockIcon from 'mastodon/../material-icons/400-24px/block-fill.svg?react'; + import { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_blocks'; import { LoadingIndicator } from '../../components/loading_indicator'; import ScrollableList from '../../components/scrollable_list'; diff --git a/app/javascript/flavours/glitch/features/explore/index.jsx b/app/javascript/flavours/glitch/features/explore/index.jsx index 64beb9b51e..0bf5ec7d87 100644 --- a/app/javascript/flavours/glitch/features/explore/index.jsx +++ b/app/javascript/flavours/glitch/features/explore/index.jsx @@ -8,13 +8,13 @@ import { NavLink, Switch, Route } from 'react-router-dom'; import { connect } from 'react-redux'; -import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react'; -import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react'; import Column from 'flavours/glitch/components/column'; import ColumnHeader from 'flavours/glitch/components/column_header'; import Search from 'flavours/glitch/features/compose/containers/search_container'; import { trendsEnabled } from 'flavours/glitch/initial_state'; +import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react'; +import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react'; import Links from './links'; import SearchResults from './results'; diff --git a/app/javascript/flavours/glitch/features/explore/results.jsx b/app/javascript/flavours/glitch/features/explore/results.jsx index 69f696f84b..4e9b7e6b2b 100644 --- a/app/javascript/flavours/glitch/features/explore/results.jsx +++ b/app/javascript/flavours/glitch/features/explore/results.jsx @@ -9,9 +9,6 @@ import { List as ImmutableList } from 'immutable'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { connect } from 'react-redux'; -import FindInPageIcon from '@material-symbols/svg-600/outlined/find_in_page.svg?react'; -import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react'; -import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react'; import { submitSearch, expandSearch } from 'flavours/glitch/actions/search'; import { ImmutableHashtag as Hashtag } from 'flavours/glitch/components/hashtag'; @@ -19,6 +16,9 @@ import { Icon } from 'flavours/glitch/components/icon'; import ScrollableList from 'flavours/glitch/components/scrollable_list'; import Account from 'flavours/glitch/containers/account_container'; import Status from 'flavours/glitch/containers/status_container'; +import FindInPageIcon from 'mastodon/../material-icons/400-24px/find_in_page.svg?react'; +import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react'; +import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react'; import { SearchSection } from './components/search_section'; diff --git a/app/javascript/flavours/glitch/features/favourited_statuses/index.jsx b/app/javascript/flavours/glitch/features/favourited_statuses/index.jsx index 86ea2331ac..24d3f52549 100644 --- a/app/javascript/flavours/glitch/features/favourited_statuses/index.jsx +++ b/app/javascript/flavours/glitch/features/favourited_statuses/index.jsx @@ -8,7 +8,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react'; import { debounce } from 'lodash'; import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns'; @@ -17,6 +16,7 @@ import ColumnHeader from 'flavours/glitch/components/column_header'; import StatusList from 'flavours/glitch/components/status_list'; import Column from 'flavours/glitch/features/ui/components/column'; import { getStatusList } from 'flavours/glitch/selectors'; +import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react'; const messages = defineMessages({ heading: { id: 'column.favourites', defaultMessage: 'Favorites' }, diff --git a/app/javascript/flavours/glitch/features/favourites/index.jsx b/app/javascript/flavours/glitch/features/favourites/index.jsx index bd705caf44..624712450e 100644 --- a/app/javascript/flavours/glitch/features/favourites/index.jsx +++ b/app/javascript/flavours/glitch/features/favourites/index.jsx @@ -8,8 +8,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import RefreshIcon from '@material-symbols/svg-600/outlined/refresh.svg?react'; -import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react'; import { debounce } from 'lodash'; import { fetchFavourites, expandFavourites } from 'flavours/glitch/actions/interactions'; @@ -19,6 +17,8 @@ import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator'; import ScrollableList from 'flavours/glitch/components/scrollable_list'; import AccountContainer from 'flavours/glitch/containers/account_container'; import Column from 'flavours/glitch/features/ui/components/column'; +import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react'; +import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react'; const messages = defineMessages({ heading: { id: 'column.favourited_by', defaultMessage: 'Favourited by' }, diff --git a/app/javascript/flavours/glitch/features/filters/select_filter.jsx b/app/javascript/flavours/glitch/features/filters/select_filter.jsx index 105f91c01b..3459df52a5 100644 --- a/app/javascript/flavours/glitch/features/filters/select_filter.jsx +++ b/app/javascript/flavours/glitch/features/filters/select_filter.jsx @@ -5,12 +5,12 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; -import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react'; import fuzzysort from 'fuzzysort'; import { Icon } from 'flavours/glitch/components/icon'; import { toServerSideType } from 'flavours/glitch/utils/filters'; import { loupeIcon, deleteIcon } from 'flavours/glitch/utils/icons'; +import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react'; const messages = defineMessages({ search: { id: 'filter_modal.select_filter.search', defaultMessage: 'Search or create' }, diff --git a/app/javascript/flavours/glitch/features/firehose/index.jsx b/app/javascript/flavours/glitch/features/firehose/index.jsx index 4e9ac47735..647c9a8796 100644 --- a/app/javascript/flavours/glitch/features/firehose/index.jsx +++ b/app/javascript/flavours/glitch/features/firehose/index.jsx @@ -6,7 +6,6 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl'; import { Helmet } from 'react-helmet'; import { NavLink } from 'react-router-dom'; -import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react'; import { addColumn } from 'flavours/glitch/actions/columns'; import { changeSetting } from 'flavours/glitch/actions/settings'; @@ -16,6 +15,7 @@ import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner import SettingText from 'flavours/glitch/components/setting_text'; import initialState, { domain } from 'flavours/glitch/initial_state'; import { useAppDispatch, useAppSelector } from 'flavours/glitch/store'; +import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react'; import Column from '../../components/column'; import ColumnHeader from '../../components/column_header'; diff --git a/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx b/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx index 9f10063f69..fc57fc744f 100644 --- a/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx +++ b/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx @@ -5,8 +5,8 @@ import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; +import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; import { Avatar } from '../../../components/avatar'; import { DisplayName } from '../../../components/display_name'; diff --git a/app/javascript/flavours/glitch/features/follow_requests/index.jsx b/app/javascript/flavours/glitch/features/follow_requests/index.jsx index 9f73d09252..683c7b4070 100644 --- a/app/javascript/flavours/glitch/features/follow_requests/index.jsx +++ b/app/javascript/flavours/glitch/features/follow_requests/index.jsx @@ -8,9 +8,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react'; import { debounce } from 'lodash'; +import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react'; + import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts'; import ScrollableList from '../../components/scrollable_list'; import { me } from '../../initial_state'; diff --git a/app/javascript/flavours/glitch/features/followed_tags/index.jsx b/app/javascript/flavours/glitch/features/followed_tags/index.jsx index ada27f107c..5680932c70 100644 --- a/app/javascript/flavours/glitch/features/followed_tags/index.jsx +++ b/app/javascript/flavours/glitch/features/followed_tags/index.jsx @@ -8,7 +8,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react'; import { debounce } from 'lodash'; import { expandFollowedHashtags, fetchFollowedHashtags } from 'flavours/glitch/actions/tags'; @@ -16,6 +15,7 @@ import ColumnHeader from 'flavours/glitch/components/column_header'; import { Hashtag } from 'flavours/glitch/components/hashtag'; import ScrollableList from 'flavours/glitch/components/scrollable_list'; import Column from 'flavours/glitch/features/ui/components/column'; +import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react'; const messages = defineMessages({ heading: { id: 'followed_tags', defaultMessage: 'Followed hashtags' }, diff --git a/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx b/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx index 386afe9dbf..636f3cddc2 100644 --- a/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx +++ b/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx @@ -9,9 +9,6 @@ import { withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react'; -import ChevronLeftIcon from '@material-symbols/svg-600/outlined/chevron_left.svg?react'; -import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react'; import TransitionMotion from 'react-motion/lib/TransitionMotion'; import spring from 'react-motion/lib/spring'; import ReactSwipeableViews from 'react-swipeable-views'; @@ -25,6 +22,9 @@ import { autoPlayGif, reduceMotion, disableSwiping, mascot } from 'flavours/glit import { assetHost } from 'flavours/glitch/utils/config'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; import elephantUIPlane from 'mastodon/../images/elephant_ui_plane.svg'; +import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react'; +import ChevronLeftIcon from 'mastodon/../material-icons/400-24px/chevron_left.svg?react'; +import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react'; const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' }, diff --git a/app/javascript/flavours/glitch/features/getting_started/index.jsx b/app/javascript/flavours/glitch/features/getting_started/index.jsx index d06534784f..341747132b 100644 --- a/app/javascript/flavours/glitch/features/getting_started/index.jsx +++ b/app/javascript/flavours/glitch/features/getting_started/index.jsx @@ -10,26 +10,26 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import BookmarksIcon from '@material-symbols/svg-600/outlined/bookmarks-fill.svg?react'; -import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react'; -import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react'; -import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react'; -import MailIcon from '@material-symbols/svg-600/outlined/mail.svg?react'; -import ManufacturingIcon from '@material-symbols/svg-600/outlined/manufacturing.svg?react'; -import MenuIcon from '@material-symbols/svg-600/outlined/menu.svg?react'; -import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react'; -import NotificationsIcon from '@material-symbols/svg-600/outlined/notifications.svg?react'; -import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react'; -import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react'; -import SettingsIcon from '@material-symbols/svg-600/outlined/settings-fill.svg?react'; -import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react'; - import { fetchFollowRequests } from 'flavours/glitch/actions/accounts'; import { fetchLists } from 'flavours/glitch/actions/lists'; import { openModal } from 'flavours/glitch/actions/modal'; import Column from 'flavours/glitch/features/ui/components/column'; import LinkFooter from 'flavours/glitch/features/ui/components/link_footer'; import { preferencesLink } from 'flavours/glitch/utils/backend_links'; +import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react'; +import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react'; +import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react'; +import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react'; +import MailIcon from 'mastodon/../material-icons/400-24px/mail.svg?react'; +import ManufacturingIcon from 'mastodon/../material-icons/400-24px/manufacturing.svg?react'; +import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react'; +import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react'; +import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications.svg?react'; +import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react'; +import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react'; +import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react'; +import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react'; + import { me, showTrends } from '../../initial_state'; import NavigationBar from '../compose/components/navigation_bar'; diff --git a/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx b/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx index c071a99f65..f02f8b226a 100644 --- a/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx +++ b/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx @@ -5,17 +5,17 @@ import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import BlockIcon from '@material-symbols/svg-600/outlined/block.svg?react'; -import InfoIcon from '@material-symbols/svg-600/outlined/info.svg?react'; -import PersonCheckIcon from '@material-symbols/svg-600/outlined/person_check.svg?react'; -import PushPinIcon from '@material-symbols/svg-600/outlined/push_pin.svg?react'; -import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react'; -import VolumeOffIcon from '@material-symbols/svg-600/outlined/volume_off.svg?react'; - import { openModal } from 'flavours/glitch/actions/modal'; import Column from 'flavours/glitch/features/ui/components/column'; import ColumnLink from 'flavours/glitch/features/ui/components/column_link'; import ColumnSubheading from 'flavours/glitch/features/ui/components/column_subheading'; +import BlockIcon from 'mastodon/../material-icons/400-24px/block.svg?react'; +import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react'; +import PersonCheckIcon from 'mastodon/../material-icons/400-24px/person_check.svg?react'; +import PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.svg?react'; +import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react'; +import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off.svg?react'; + const messages = defineMessages({ heading: { id: 'column.heading', defaultMessage: 'Misc' }, diff --git a/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx b/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx index c957735abf..55ae5cfdab 100644 --- a/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx +++ b/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx @@ -8,7 +8,6 @@ import { Helmet } from 'react-helmet'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { connect } from 'react-redux'; -import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react'; import { isEqual } from 'lodash'; import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns'; @@ -17,6 +16,7 @@ import { fetchHashtag, followHashtag, unfollowHashtag } from 'flavours/glitch/ac import { expandHashtagTimeline, clearTimeline } from 'flavours/glitch/actions/timelines'; import Column from 'flavours/glitch/components/column'; import ColumnHeader from 'flavours/glitch/components/column_header'; +import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react'; import StatusListContainer from '../ui/containers/status_list_container'; diff --git a/app/javascript/flavours/glitch/features/home_timeline/index.jsx b/app/javascript/flavours/glitch/features/home_timeline/index.jsx index 17685ce9b3..c656b2d7c8 100644 --- a/app/javascript/flavours/glitch/features/home_timeline/index.jsx +++ b/app/javascript/flavours/glitch/features/home_timeline/index.jsx @@ -10,14 +10,14 @@ import { createSelector } from '@reduxjs/toolkit'; import { List as ImmutableList } from 'immutable'; import { connect } from 'react-redux'; -import CampaignIcon from '@material-symbols/svg-600/outlined/campaign.svg?react'; -import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react'; import { fetchAnnouncements, toggleShowAnnouncements } from 'flavours/glitch/actions/announcements'; import { IconWithBadge } from 'flavours/glitch/components/icon_with_badge'; import { NotSignedInIndicator } from 'flavours/glitch/components/not_signed_in_indicator'; import AnnouncementsContainer from 'flavours/glitch/features/getting_started/containers/announcements_container'; import { me, criticalUpdatesPending } from 'flavours/glitch/initial_state'; +import CampaignIcon from 'mastodon/../material-icons/400-24px/campaign.svg?react'; +import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react'; import { addColumn, removeColumn, moveColumn } from '../../actions/columns'; import { expandHomeTimeline } from '../../actions/timelines'; diff --git a/app/javascript/flavours/glitch/features/interaction_modal/index.jsx b/app/javascript/flavours/glitch/features/interaction_modal/index.jsx index 31bf7b324b..2902cde9cf 100644 --- a/app/javascript/flavours/glitch/features/interaction_modal/index.jsx +++ b/app/javascript/flavours/glitch/features/interaction_modal/index.jsx @@ -7,10 +7,6 @@ import classNames from 'classnames'; import { connect } from 'react-redux'; -import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react'; -import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react'; -import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react'; -import StarIcon from '@material-symbols/svg-600/outlined/star.svg?react'; import { throttle, escapeRegExp } from 'lodash'; import { openModal, closeModal } from 'flavours/glitch/actions/modal'; @@ -18,6 +14,10 @@ import api from 'flavours/glitch/api'; import { Button } from 'flavours/glitch/components/button'; import { Icon } from 'flavours/glitch/components/icon'; import { registrationsOpen, sso_redirect } from 'flavours/glitch/initial_state'; +import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react'; +import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react'; +import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react'; +import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react'; const messages = defineMessages({ loginPrompt: { id: 'interaction_modal.login.prompt', defaultMessage: 'Domain of your home server, e.g. mastodon.social' }, diff --git a/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx b/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx index da9490f09e..65131bf80c 100644 --- a/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx +++ b/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx @@ -7,10 +7,10 @@ import { Helmet } from 'react-helmet'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import InfoIcon from '@material-symbols/svg-600/outlined/info.svg?react'; import Column from 'flavours/glitch/components/column'; import ColumnHeader from 'flavours/glitch/components/column_header'; +import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react'; const messages = defineMessages({ heading: { id: 'keyboard_shortcuts.heading', defaultMessage: 'Keyboard Shortcuts' }, diff --git a/app/javascript/flavours/glitch/features/list_adder/components/list.jsx b/app/javascript/flavours/glitch/features/list_adder/components/list.jsx index 865d51d0eb..142c1de879 100644 --- a/app/javascript/flavours/glitch/features/list_adder/components/list.jsx +++ b/app/javascript/flavours/glitch/features/list_adder/components/list.jsx @@ -6,11 +6,11 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; -import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; +import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; +import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react'; + import { removeFromListAdder, addToListAdder } from '../../../actions/lists'; import { IconButton } from '../../../components/icon_button'; diff --git a/app/javascript/flavours/glitch/features/list_editor/components/account.jsx b/app/javascript/flavours/glitch/features/list_editor/components/account.jsx index 30595ebc8b..f406f24fa7 100644 --- a/app/javascript/flavours/glitch/features/list_editor/components/account.jsx +++ b/app/javascript/flavours/glitch/features/list_editor/components/account.jsx @@ -6,8 +6,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; +import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; import { removeFromListEditor, addToListEditor } from '../../../actions/lists'; import { Avatar } from '../../../components/avatar'; diff --git a/app/javascript/flavours/glitch/features/list_editor/components/edit_list_form.jsx b/app/javascript/flavours/glitch/features/list_editor/components/edit_list_form.jsx index db89611db2..ad29d08a93 100644 --- a/app/javascript/flavours/glitch/features/list_editor/components/edit_list_form.jsx +++ b/app/javascript/flavours/glitch/features/list_editor/components/edit_list_form.jsx @@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl'; import { connect } from 'react-redux'; -import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react'; +import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react'; import { changeListEditorTitle, submitListEditor } from '../../../actions/lists'; import { IconButton } from '../../../components/icon_button'; diff --git a/app/javascript/flavours/glitch/features/list_editor/components/search.jsx b/app/javascript/flavours/glitch/features/list_editor/components/search.jsx index f19489fd62..f1ae60a765 100644 --- a/app/javascript/flavours/glitch/features/list_editor/components/search.jsx +++ b/app/javascript/flavours/glitch/features/list_editor/components/search.jsx @@ -7,10 +7,10 @@ import classNames from 'classnames'; import { connect } from 'react-redux'; -import CancelIcon from '@material-symbols/svg-600/outlined/cancel.svg?react'; -import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; +import CancelIcon from 'mastodon/../material-icons/400-24px/cancel.svg?react'; +import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react'; + import { fetchListSuggestions, clearListSuggestions, changeListSuggestions } from '../../../actions/lists'; diff --git a/app/javascript/flavours/glitch/features/list_timeline/index.jsx b/app/javascript/flavours/glitch/features/list_timeline/index.jsx index 670480ccaa..a709d5f9a1 100644 --- a/app/javascript/flavours/glitch/features/list_timeline/index.jsx +++ b/app/javascript/flavours/glitch/features/list_timeline/index.jsx @@ -9,9 +9,6 @@ import { withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { connect } from 'react-redux'; -import DeleteIcon from '@material-symbols/svg-600/outlined/delete.svg?react'; -import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react'; -import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react'; import Toggle from 'react-toggle'; import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns'; @@ -27,6 +24,9 @@ import { RadioButton } from 'flavours/glitch/components/radio_button'; import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error'; import StatusListContainer from 'flavours/glitch/features/ui/containers/status_list_container'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import DeleteIcon from 'mastodon/../material-icons/400-24px/delete.svg?react'; +import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react'; +import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react'; const messages = defineMessages({ deleteMessage: { id: 'confirmations.delete_list.message', defaultMessage: 'Are you sure you want to permanently delete this list?' }, diff --git a/app/javascript/flavours/glitch/features/lists/index.jsx b/app/javascript/flavours/glitch/features/lists/index.jsx index 66c14da2c2..6b95183cf0 100644 --- a/app/javascript/flavours/glitch/features/lists/index.jsx +++ b/app/javascript/flavours/glitch/features/lists/index.jsx @@ -9,7 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react'; import { fetchLists } from 'flavours/glitch/actions/lists'; import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator'; @@ -17,6 +16,7 @@ import ScrollableList from 'flavours/glitch/components/scrollable_list'; import Column from 'flavours/glitch/features/ui/components/column'; import ColumnLink from 'flavours/glitch/features/ui/components/column_link'; import ColumnSubheading from 'flavours/glitch/features/ui/components/column_subheading'; +import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react'; import NewListForm from './components/new_list_form'; diff --git a/app/javascript/flavours/glitch/features/local_settings/navigation/index.jsx b/app/javascript/flavours/glitch/features/local_settings/navigation/index.jsx index 3eb8bca769..f75d2fd336 100644 --- a/app/javascript/flavours/glitch/features/local_settings/navigation/index.jsx +++ b/app/javascript/flavours/glitch/features/local_settings/navigation/index.jsx @@ -4,14 +4,14 @@ import { PureComponent } from 'react'; import { injectIntl, defineMessages } from 'react-intl'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; -import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react'; -import ExpandLessIcon from '@material-symbols/svg-600/outlined/expand_less.svg?react'; -import ImageIcon from '@material-symbols/svg-600/outlined/image.svg?react'; -import ManufacturingIcon from '@material-symbols/svg-600/outlined/manufacturing.svg?react'; -import SettingsIcon from '@material-symbols/svg-600/outlined/settings-fill.svg?react'; - import { preferencesLink } from 'flavours/glitch/utils/backend_links'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; +import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react'; +import ExpandLessIcon from 'mastodon/../material-icons/400-24px/expand_less.svg?react'; +import ImageIcon from 'mastodon/../material-icons/400-24px/image.svg?react'; +import ManufacturingIcon from 'mastodon/../material-icons/400-24px/manufacturing.svg?react'; +import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react'; + import LocalSettingsNavigationItem from './item'; diff --git a/app/javascript/flavours/glitch/features/mutes/index.jsx b/app/javascript/flavours/glitch/features/mutes/index.jsx index ab0d30fcd1..316eaba220 100644 --- a/app/javascript/flavours/glitch/features/mutes/index.jsx +++ b/app/javascript/flavours/glitch/features/mutes/index.jsx @@ -8,9 +8,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import VolumeOffIcon from '@material-symbols/svg-600/outlined/volume_off.svg?react'; import { debounce } from 'lodash'; +import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off.svg?react'; + import { fetchMutes, expandMutes } from '../../actions/mutes'; import { LoadingIndicator } from '../../components/loading_indicator'; import ScrollableList from '../../components/scrollable_list'; diff --git a/app/javascript/flavours/glitch/features/notifications/components/admin_report.jsx b/app/javascript/flavours/glitch/features/notifications/components/admin_report.jsx index c92ff0ced0..646d9504a5 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/admin_report.jsx +++ b/app/javascript/flavours/glitch/features/notifications/components/admin_report.jsx @@ -8,12 +8,12 @@ import { withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import FlagIcon from '@material-symbols/svg-600/outlined/flag-fill.svg?react'; import { HotKeys } from 'react-hotkeys'; import { Icon } from 'flavours/glitch/components/icon'; import { Permalink } from 'flavours/glitch/components/permalink'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import FlagIcon from 'mastodon/../material-icons/400-24px/flag-fill.svg?react'; import NotificationOverlayContainer from '../containers/overlay_container'; diff --git a/app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx b/app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx index c3f5a2f655..cb232047e0 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx +++ b/app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx @@ -8,13 +8,13 @@ import { withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add-fill.svg?react'; import { HotKeys } from 'react-hotkeys'; import { Icon } from 'flavours/glitch/components/icon'; import { Permalink } from 'flavours/glitch/components/permalink'; import AccountContainer from 'flavours/glitch/containers/account_container'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add-fill.svg?react'; import NotificationOverlayContainer from '../containers/overlay_container'; diff --git a/app/javascript/flavours/glitch/features/notifications/components/clear_column_button.jsx b/app/javascript/flavours/glitch/features/notifications/components/clear_column_button.jsx index 774830d484..58e2f527f5 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/clear_column_button.jsx +++ b/app/javascript/flavours/glitch/features/notifications/components/clear_column_button.jsx @@ -3,9 +3,9 @@ import { PureComponent } from 'react'; import { FormattedMessage } from 'react-intl'; -import DeleteForeverIcon from '@material-symbols/svg-600/outlined/delete_forever.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; +import DeleteForeverIcon from 'mastodon/../material-icons/400-24px/delete_forever.svg?react'; + export default class ClearColumnButton extends PureComponent { diff --git a/app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx b/app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx index 4822b484c7..fd668e3631 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx +++ b/app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx @@ -3,14 +3,14 @@ import { PureComponent } from 'react'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; -import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react'; -import InsertChartIcon from '@material-symbols/svg-600/outlined/insert_chart.svg?react'; -import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react'; -import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react'; -import ReplyAllIcon from '@material-symbols/svg-600/outlined/reply_all.svg?react'; -import StarIcon from '@material-symbols/svg-600/outlined/star.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; +import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react'; +import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react'; +import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react'; +import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react'; +import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react'; +import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react'; + const tooltips = defineMessages({ mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' }, diff --git a/app/javascript/flavours/glitch/features/notifications/components/follow.jsx b/app/javascript/flavours/glitch/features/notifications/components/follow.jsx index 2610b7726a..04e7280260 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/follow.jsx +++ b/app/javascript/flavours/glitch/features/notifications/components/follow.jsx @@ -8,13 +8,13 @@ import { withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add-fill.svg?react'; import { HotKeys } from 'react-hotkeys'; import { Icon } from 'flavours/glitch/components/icon'; import { Permalink } from 'flavours/glitch/components/permalink'; import AccountContainer from 'flavours/glitch/containers/account_container'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add-fill.svg?react'; import NotificationOverlayContainer from '../containers/overlay_container'; diff --git a/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx b/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx index e2bb1dfca5..6f167adba8 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx +++ b/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx @@ -8,9 +8,6 @@ import { withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; -import PersonIcon from '@material-symbols/svg-600/outlined/person-fill.svg?react'; import { HotKeys } from 'react-hotkeys'; import { Avatar } from 'flavours/glitch/components/avatar'; @@ -19,6 +16,9 @@ import { Icon } from 'flavours/glitch/components/icon'; import { IconButton } from 'flavours/glitch/components/icon_button'; import { Permalink } from 'flavours/glitch/components/permalink'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; +import PersonIcon from 'mastodon/../material-icons/400-24px/person-fill.svg?react'; import NotificationOverlayContainer from '../containers/overlay_container'; diff --git a/app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx b/app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx index b8b9a1207c..92b1bf82bd 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx +++ b/app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx @@ -5,14 +5,14 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; -import TuneIcon from '@material-symbols/svg-600/outlined/tune.svg?react'; import { requestBrowserPermission } from 'flavours/glitch/actions/notifications'; import { changeSetting } from 'flavours/glitch/actions/settings'; import { Button } from 'flavours/glitch/components/button'; import { Icon } from 'flavours/glitch/components/icon'; import { IconButton } from 'flavours/glitch/components/icon_button'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; +import TuneIcon from 'mastodon/../material-icons/400-24px/tune.svg?react'; const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' }, diff --git a/app/javascript/flavours/glitch/features/notifications/components/overlay.jsx b/app/javascript/flavours/glitch/features/notifications/components/overlay.jsx index 28bc58ed71..1b9822cf09 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/overlay.jsx +++ b/app/javascript/flavours/glitch/features/notifications/components/overlay.jsx @@ -9,9 +9,9 @@ import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; +import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react'; + const messages = defineMessages({ markForDeletion: { id: 'notification.markForDeletion', defaultMessage: 'Mark for deletion' }, diff --git a/app/javascript/flavours/glitch/features/notifications/index.jsx b/app/javascript/flavours/glitch/features/notifications/index.jsx index c2903cd1ec..0a7c29cd38 100644 --- a/app/javascript/flavours/glitch/features/notifications/index.jsx +++ b/app/javascript/flavours/glitch/features/notifications/index.jsx @@ -11,14 +11,14 @@ import { List as ImmutableList } from 'immutable'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { connect } from 'react-redux'; -import DeleteForeverIcon from '@material-symbols/svg-600/outlined/delete_forever.svg?react'; -import DoneAllIcon from '@material-symbols/svg-600/outlined/done_all.svg?react'; -import NotificationsIcon from '@material-symbols/svg-600/outlined/notifications-fill.svg?react'; import { debounce } from 'lodash'; import { compareId } from 'flavours/glitch/compare_id'; import { Icon } from 'flavours/glitch/components/icon'; import { NotSignedInIndicator } from 'flavours/glitch/components/not_signed_in_indicator'; +import DeleteForeverIcon from 'mastodon/../material-icons/400-24px/delete_forever.svg?react'; +import DoneAllIcon from 'mastodon/../material-icons/400-24px/done_all.svg?react'; +import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications-fill.svg?react'; import { addColumn, removeColumn, moveColumn } from '../../actions/columns'; import { submitMarkers } from '../../actions/markers'; diff --git a/app/javascript/flavours/glitch/features/onboarding/components/step.jsx b/app/javascript/flavours/glitch/features/onboarding/components/step.jsx index 4e56b365fa..7f278fa013 100644 --- a/app/javascript/flavours/glitch/features/onboarding/components/step.jsx +++ b/app/javascript/flavours/glitch/features/onboarding/components/step.jsx @@ -2,10 +2,10 @@ import PropTypes from 'prop-types'; import { Link } from 'react-router-dom'; -import ArrowRightAltIcon from '@material-symbols/svg-600/outlined/arrow_right_alt.svg?react'; -import CheckIcon from '@material-symbols/svg-600/outlined/done.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; +import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react'; +import CheckIcon from 'mastodon/../material-icons/400-24px/done.svg?react'; + export const Step = ({ label, description, icon, iconComponent, completed, onClick, href, to }) => { const content = ( diff --git a/app/javascript/flavours/glitch/features/onboarding/index.jsx b/app/javascript/flavours/glitch/features/onboarding/index.jsx index 4f3ef9eda9..8e465b48bf 100644 --- a/app/javascript/flavours/glitch/features/onboarding/index.jsx +++ b/app/javascript/flavours/glitch/features/onboarding/index.jsx @@ -8,11 +8,6 @@ import { Link, Switch, Route, useHistory } from 'react-router-dom'; import { useDispatch } from 'react-redux'; -import AccountCircleIcon from '@material-symbols/svg-600/outlined/account_circle.svg?react'; -import ArrowRightAltIcon from '@material-symbols/svg-600/outlined/arrow_right_alt.svg?react'; -import ContentCopyIcon from '@material-symbols/svg-600/outlined/content_copy.svg?react'; -import EditNoteIcon from '@material-symbols/svg-600/outlined/edit_note.svg?react'; -import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react'; import { focusCompose } from 'flavours/glitch/actions/compose'; import { Icon } from 'flavours/glitch/components/icon'; @@ -21,6 +16,11 @@ import { me } from 'flavours/glitch/initial_state'; import { useAppSelector } from 'flavours/glitch/store'; import { assetHost } from 'flavours/glitch/utils/config'; import illustration from 'mastodon/../images/elephant_ui_conversation.svg'; +import AccountCircleIcon from 'mastodon/../material-icons/400-24px/account_circle.svg?react'; +import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react'; +import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react'; +import EditNoteIcon from 'mastodon/../material-icons/400-24px/edit_note.svg?react'; +import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react'; import { Step } from './components/step'; import { Follows } from './follows'; diff --git a/app/javascript/flavours/glitch/features/onboarding/profile.jsx b/app/javascript/flavours/glitch/features/onboarding/profile.jsx index 4c5f870c93..78782a3d93 100644 --- a/app/javascript/flavours/glitch/features/onboarding/profile.jsx +++ b/app/javascript/flavours/glitch/features/onboarding/profile.jsx @@ -8,8 +8,6 @@ import { useHistory } from 'react-router-dom'; import { useDispatch } from 'react-redux'; -import AddPhotoAlternateIcon from '@material-symbols/svg-600/outlined/add_photo_alternate.svg?react'; -import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react'; import Toggle from 'react-toggle'; import { updateAccount } from 'flavours/glitch/actions/accounts'; @@ -20,6 +18,8 @@ import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator'; import { me } from 'flavours/glitch/initial_state'; import { useAppSelector } from 'flavours/glitch/store'; import { unescapeHTML } from 'flavours/glitch/utils/html'; +import AddPhotoAlternateIcon from 'mastodon/../material-icons/400-24px/add_photo_alternate.svg?react'; +import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react'; const messages = defineMessages({ uploadHeader: { id: 'onboarding.profile.upload_header', defaultMessage: 'Upload profile header' }, diff --git a/app/javascript/flavours/glitch/features/onboarding/share.jsx b/app/javascript/flavours/glitch/features/onboarding/share.jsx index 29c1ce0d84..cbc5abc027 100644 --- a/app/javascript/flavours/glitch/features/onboarding/share.jsx +++ b/app/javascript/flavours/glitch/features/onboarding/share.jsx @@ -7,14 +7,14 @@ import classNames from 'classnames'; import { Link } from 'react-router-dom'; -import ArrowRightAltIcon from '@material-symbols/svg-600/outlined/arrow_right_alt.svg?react'; -import ContentCopyIcon from '@material-symbols/svg-600/outlined/content_copy.svg?react'; import SwipeableViews from 'react-swipeable-views'; import { ColumnBackButton } from 'flavours/glitch/components/column_back_button'; import { Icon } from 'flavours/glitch/components/icon'; import { me, domain } from 'flavours/glitch/initial_state'; import { useAppSelector } from 'flavours/glitch/store'; +import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react'; +import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react'; const messages = defineMessages({ shareableMessage: { id: 'onboarding.share.message', defaultMessage: 'I\'m {username} on #Mastodon! Come follow me at {url}' }, diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx index 877c999c36..f34ba7e475 100644 --- a/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx +++ b/app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx @@ -9,11 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import OpenInNewIcon from '@material-symbols/svg-600/outlined/open_in_new.svg?react'; -import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react'; -import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react'; -import ReplyAllIcon from '@material-symbols/svg-600/outlined/reply_all.svg?react'; -import StarIcon from '@material-symbols/svg-600/outlined/star.svg?react'; import { initBoostModal } from 'flavours/glitch/actions/boosts'; import { replyCompose } from 'flavours/glitch/actions/compose'; @@ -23,6 +18,11 @@ import { IconButton } from 'flavours/glitch/components/icon_button'; import { me, boostModal } from 'flavours/glitch/initial_state'; import { makeGetStatus } from 'flavours/glitch/selectors'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import OpenInNewIcon from 'mastodon/../material-icons/400-24px/open_in_new.svg?react'; +import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react'; +import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react'; +import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react'; +import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react'; const messages = defineMessages({ reply: { id: 'status.reply', defaultMessage: 'Reply' }, diff --git a/app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx b/app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx index 0213b1f4f6..805561b92d 100644 --- a/app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx +++ b/app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx @@ -8,11 +8,11 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; import { Avatar } from 'flavours/glitch/components/avatar'; import { DisplayName } from 'flavours/glitch/components/display_name'; import { IconButton } from 'flavours/glitch/components/icon_button'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' }, diff --git a/app/javascript/flavours/glitch/features/pinned_statuses/index.jsx b/app/javascript/flavours/glitch/features/pinned_statuses/index.jsx index c3224ee046..2f16f26cfa 100644 --- a/app/javascript/flavours/glitch/features/pinned_statuses/index.jsx +++ b/app/javascript/flavours/glitch/features/pinned_statuses/index.jsx @@ -8,9 +8,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import PushPinIcon from '@material-symbols/svg-600/outlined/push_pin.svg?react'; - import { getStatusList } from 'flavours/glitch/selectors'; +import PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.svg?react'; + import { fetchPinnedStatuses } from '../../actions/pin_statuses'; import StatusList from '../../components/status_list'; diff --git a/app/javascript/flavours/glitch/features/public_timeline/index.jsx b/app/javascript/flavours/glitch/features/public_timeline/index.jsx index e425c1a6fa..1686b8dc51 100644 --- a/app/javascript/flavours/glitch/features/public_timeline/index.jsx +++ b/app/javascript/flavours/glitch/features/public_timeline/index.jsx @@ -7,10 +7,10 @@ import { Helmet } from 'react-helmet'; import { connect } from 'react-redux'; -import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react'; import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner'; import { domain } from 'flavours/glitch/initial_state'; +import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react'; import { addColumn, removeColumn, moveColumn } from '../../actions/columns'; import { connectPublicStream } from '../../actions/streaming'; diff --git a/app/javascript/flavours/glitch/features/reblogs/index.jsx b/app/javascript/flavours/glitch/features/reblogs/index.jsx index 6eeeee82b1..b7e7746ae4 100644 --- a/app/javascript/flavours/glitch/features/reblogs/index.jsx +++ b/app/javascript/flavours/glitch/features/reblogs/index.jsx @@ -8,11 +8,12 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import RefreshIcon from '@material-symbols/svg-600/outlined/refresh.svg?react'; -import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react'; import { debounce } from 'lodash'; import { Icon } from 'flavours/glitch/components/icon'; +import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react'; +import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react'; + import { fetchReblogs, expandReblogs } from '../../actions/interactions'; import ColumnHeader from '../../components/column_header'; diff --git a/app/javascript/flavours/glitch/features/report/components/option.jsx b/app/javascript/flavours/glitch/features/report/components/option.jsx index 65911602b0..3faf5cfe9b 100644 --- a/app/javascript/flavours/glitch/features/report/components/option.jsx +++ b/app/javascript/flavours/glitch/features/report/components/option.jsx @@ -3,9 +3,9 @@ import { PureComponent } from 'react'; import classNames from 'classnames'; -import CheckIcon from '@material-symbols/svg-600/outlined/done.svg?react'; - import { Icon } from 'flavours/glitch/components/icon'; +import CheckIcon from 'mastodon/../material-icons/400-24px/done.svg?react'; + export default class Option extends PureComponent { diff --git a/app/javascript/flavours/glitch/features/status/components/action_bar.jsx b/app/javascript/flavours/glitch/features/status/components/action_bar.jsx index 2d9653af84..656a69255c 100644 --- a/app/javascript/flavours/glitch/features/status/components/action_bar.jsx +++ b/app/javascript/flavours/glitch/features/status/components/action_bar.jsx @@ -8,18 +8,17 @@ import { withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import BookmarkIcon from '@material-symbols/svg-600/outlined/bookmark-fill.svg?react'; -import BookmarkBorderIcon from '@material-symbols/svg-600/outlined/bookmark.svg?react'; -import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react'; -import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react'; -import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react'; -import ReplyAllIcon from '@material-symbols/svg-600/outlined/reply_all.svg?react'; -import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react'; -import StarBorderIcon from '@material-symbols/svg-600/outlined/star.svg?react'; - import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'flavours/glitch/permissions'; import { accountAdminLink, statusAdminLink } from 'flavours/glitch/utils/backend_links'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg?react'; +import BookmarkBorderIcon from 'mastodon/../material-icons/400-24px/bookmark.svg?react'; +import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react'; +import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react'; +import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react'; +import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react'; +import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react'; +import StarBorderIcon from 'mastodon/../material-icons/400-24px/star.svg?react'; import RepeatDisabledIcon from 'mastodon/../svg-icons/repeat_disabled.svg'; import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg'; diff --git a/app/javascript/flavours/glitch/features/status/components/card.jsx b/app/javascript/flavours/glitch/features/status/components/card.jsx index 49eb2f7a23..62e4d23f85 100644 --- a/app/javascript/flavours/glitch/features/status/components/card.jsx +++ b/app/javascript/flavours/glitch/features/status/components/card.jsx @@ -8,14 +8,14 @@ import classNames from 'classnames'; import Immutable from 'immutable'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import DescriptionIcon from '@material-symbols/svg-600/outlined/description-fill.svg?react'; -import OpenInNewIcon from '@material-symbols/svg-600/outlined/open_in_new.svg?react'; -import PlayArrowIcon from '@material-symbols/svg-600/outlined/play_arrow-fill.svg?react'; import { Blurhash } from 'flavours/glitch/components/blurhash'; import { Icon } from 'flavours/glitch/components/icon'; import { useBlurhash } from 'flavours/glitch/initial_state'; import { decode as decodeIDNA } from 'flavours/glitch/utils/idna'; +import DescriptionIcon from 'mastodon/../material-icons/400-24px/description-fill.svg?react'; +import OpenInNewIcon from 'mastodon/../material-icons/400-24px/open_in_new.svg?react'; +import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow-fill.svg?react'; const getHostname = url => { const parser = document.createElement('a'); diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx index 88e74dba76..6aabba0ad4 100644 --- a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx +++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx @@ -8,8 +8,6 @@ import { Link, withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react'; -import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react'; import { AnimatedNumber } from 'flavours/glitch/components/animated_number'; import AttachmentList from 'flavours/glitch/components/attachment_list'; @@ -20,6 +18,8 @@ import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_p import { VisibilityIcon } from 'flavours/glitch/components/visibility_icon'; import PollContainer from 'flavours/glitch/containers/poll_container'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react'; +import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react'; import { Avatar } from '../../../components/avatar'; import { DisplayName } from '../../../components/display_name'; diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx index 19aee0ceed..23886c405f 100644 --- a/app/javascript/flavours/glitch/features/status/index.jsx +++ b/app/javascript/flavours/glitch/features/status/index.jsx @@ -12,9 +12,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import ChatIcon from '@material-symbols/svg-600/outlined/chat.svg?react'; -import VisibilityIcon from '@material-symbols/svg-600/outlined/visibility.svg?react'; -import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react'; import { HotKeys } from 'react-hotkeys'; import { Icon } from 'flavours/glitch/components/icon'; @@ -23,6 +20,9 @@ import ScrollContainer from 'flavours/glitch/containers/scroll_container'; import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error'; import { autoUnfoldCW } from 'flavours/glitch/utils/content_warning'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import ChatIcon from 'mastodon/../material-icons/400-24px/chat.svg?react'; +import VisibilityIcon from 'mastodon/../material-icons/400-24px/visibility.svg?react'; +import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react'; import { initBlockModal } from '../../actions/blocks'; import { initBoostModal } from '../../actions/boosts'; diff --git a/app/javascript/flavours/glitch/features/subscribed_languages_modal/index.jsx b/app/javascript/flavours/glitch/features/subscribed_languages_modal/index.jsx index 195f3959fc..f1c0d8cf81 100644 --- a/app/javascript/flavours/glitch/features/subscribed_languages_modal/index.jsx +++ b/app/javascript/flavours/glitch/features/subscribed_languages_modal/index.jsx @@ -8,13 +8,13 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; import { followAccount } from 'flavours/glitch/actions/accounts'; import { Button } from 'flavours/glitch/components/button'; import { IconButton } from 'flavours/glitch/components/icon_button'; import Option from 'flavours/glitch/features/report/components/option'; import { languages as preloadedLanguages } from 'flavours/glitch/initial_state'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' }, diff --git a/app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx index afd63eea18..6c29a45b95 100644 --- a/app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx @@ -9,7 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react'; import { changeBoostPrivacy } from 'flavours/glitch/actions/boosts'; import AttachmentList from 'flavours/glitch/components/attachment_list'; @@ -17,6 +16,7 @@ import { Icon } from 'flavours/glitch/components/icon'; import { VisibilityIcon } from 'flavours/glitch/components/visibility_icon'; import PrivacyDropdown from 'flavours/glitch/features/compose/components/privacy_dropdown'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react'; import { Avatar } from '../../../components/avatar'; import { Button } from '../../../components/button'; diff --git a/app/javascript/flavours/glitch/features/ui/components/bundle_modal_error.jsx b/app/javascript/flavours/glitch/features/ui/components/bundle_modal_error.jsx index 31c4ce0e97..dd2a10608d 100644 --- a/app/javascript/flavours/glitch/features/ui/components/bundle_modal_error.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/bundle_modal_error.jsx @@ -3,7 +3,7 @@ import { PureComponent } from 'react'; import { defineMessages, injectIntl } from 'react-intl'; -import RefreshIcon from '@material-symbols/svg-600/outlined/refresh.svg?react'; +import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react'; import { IconButton } from '../../../components/icon_button'; diff --git a/app/javascript/flavours/glitch/features/ui/components/compare_history_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/compare_history_modal.jsx index 87f81a072a..aeabbcddd1 100644 --- a/app/javascript/flavours/glitch/features/ui/components/compare_history_modal.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/compare_history_modal.jsx @@ -6,7 +6,6 @@ import { FormattedMessage } from 'react-intl'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { connect } from 'react-redux'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; import escapeTextContentForBrowser from 'escape-html'; import { closeModal } from 'flavours/glitch/actions/modal'; @@ -15,6 +14,7 @@ import InlineAccount from 'flavours/glitch/components/inline_account'; import MediaAttachments from 'flavours/glitch/components/media_attachments'; import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp'; import emojify from 'flavours/glitch/features/emoji/emoji'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; const mapStateToProps = (state, { statusId }) => ({ language: state.getIn(['statuses', statusId, 'language']), diff --git a/app/javascript/flavours/glitch/features/ui/components/deprecated_settings_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/deprecated_settings_modal.jsx index 231708aa50..2f46218c54 100644 --- a/app/javascript/flavours/glitch/features/ui/components/deprecated_settings_modal.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/deprecated_settings_modal.jsx @@ -5,13 +5,13 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import ManufacturingIcon from '@material-symbols/svg-600/outlined/manufacturing.svg?react'; -import SettingsIcon from '@material-symbols/svg-600/outlined/settings-fill.svg?react'; import { Button } from 'flavours/glitch/components/button'; import { Icon } from 'flavours/glitch/components/icon'; import illustration from 'flavours/glitch/images/logo_warn_glitch.svg'; import { preferenceLink } from 'flavours/glitch/utils/backend_links'; +import ManufacturingIcon from 'mastodon/../material-icons/400-24px/manufacturing.svg?react'; +import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react'; const messages = defineMessages({ discardChanges: { id: 'confirmations.deprecated_settings.confirm', defaultMessage: 'Use Mastodon preferences' }, diff --git a/app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx index 8092b9eec1..ba4400dc11 100644 --- a/app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx @@ -4,10 +4,10 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; import api from 'flavours/glitch/api'; import { IconButton } from 'flavours/glitch/components/icon_button'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' }, diff --git a/app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx index 1efa93a07c..0e4ad43d80 100644 --- a/app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx @@ -8,7 +8,6 @@ import { withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react'; import AttachmentList from 'flavours/glitch/components/attachment_list'; import { Avatar } from 'flavours/glitch/components/avatar'; @@ -19,6 +18,7 @@ import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp import StatusContent from 'flavours/glitch/components/status_content'; import { VisibilityIcon } from 'flavours/glitch/components/visibility_icon'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; +import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react'; const messages = defineMessages({ favourite: { id: 'status.favourite', defaultMessage: 'Favorite' }, diff --git a/app/javascript/flavours/glitch/features/ui/components/filter_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/filter_modal.jsx index 917b9e63e5..4bab7f326c 100644 --- a/app/javascript/flavours/glitch/features/ui/components/filter_modal.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/filter_modal.jsx @@ -5,13 +5,13 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; import { fetchFilters, createFilter, createFilterStatus } from 'flavours/glitch/actions/filters'; import { fetchStatus } from 'flavours/glitch/actions/statuses'; import { IconButton } from 'flavours/glitch/components/icon_button'; import AddedToFilter from 'flavours/glitch/features/filters/added_to_filter'; import SelectFilter from 'flavours/glitch/features/filters/select_filter'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' }, diff --git a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx index 3e805b75bc..66b4ff2ff0 100644 --- a/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx @@ -9,7 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; import Textarea from 'react-textarea-autosize'; import { length } from 'stringz'; // eslint-disable-next-line import/extensions @@ -26,6 +25,7 @@ import UploadProgress from 'flavours/glitch/features/compose/components/upload_p import { Tesseract as fetchTesseract } from 'flavours/glitch/features/ui/util/async-components'; import { me } from 'flavours/glitch/initial_state'; import { assetHost } from 'flavours/glitch/utils/config'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; import { changeUploadCompose, uploadThumbnail, onChangeMediaDescription, onChangeMediaFocus } from '../../../actions/compose'; import Video, { getPointerPosition } from '../../video'; diff --git a/app/javascript/flavours/glitch/features/ui/components/follow_requests_column_link.jsx b/app/javascript/flavours/glitch/features/ui/components/follow_requests_column_link.jsx index 8b2b061a19..1225236edd 100644 --- a/app/javascript/flavours/glitch/features/ui/components/follow_requests_column_link.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/follow_requests_column_link.jsx @@ -6,11 +6,10 @@ import { injectIntl, defineMessages } from 'react-intl'; import { List as ImmutableList } from 'immutable'; import { connect } from 'react-redux'; -import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react'; - import { fetchFollowRequests } from 'flavours/glitch/actions/accounts'; import { IconWithBadge } from 'flavours/glitch/components/icon_with_badge'; import ColumnLink from 'flavours/glitch/features/ui/components/column_link'; +import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react'; const messages = defineMessages({ text: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' }, diff --git a/app/javascript/flavours/glitch/features/ui/components/header.jsx b/app/javascript/flavours/glitch/features/ui/components/header.jsx index f7c0955472..a7aecc5d11 100644 --- a/app/javascript/flavours/glitch/features/ui/components/header.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/header.jsx @@ -7,8 +7,6 @@ import { Link, withRouter } from 'react-router-dom'; import { connect } from 'react-redux'; -import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react'; - import { openModal } from 'flavours/glitch/actions/modal'; import { fetchServer } from 'flavours/glitch/actions/server'; import { Avatar } from 'flavours/glitch/components/avatar'; @@ -16,6 +14,7 @@ import { Icon } from 'flavours/glitch/components/icon'; import { WordmarkLogo, SymbolLogo } from 'flavours/glitch/components/logo'; import { Permalink } from 'flavours/glitch/components/permalink'; import { registrationsOpen, me, sso_redirect } from 'flavours/glitch/initial_state'; +import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react'; const Account = connect(state => ({ account: state.getIn(['accounts', me]), diff --git a/app/javascript/flavours/glitch/features/ui/components/image_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/image_modal.jsx index 5b533a4ef7..9f0cb08349 100644 --- a/app/javascript/flavours/glitch/features/ui/components/image_modal.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/image_modal.jsx @@ -5,9 +5,8 @@ import { defineMessages, injectIntl } from 'react-intl'; import classNames from 'classnames'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; - import { IconButton } from 'flavours/glitch/components/icon_button'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; import ImageLoader from './image_loader'; diff --git a/app/javascript/flavours/glitch/features/ui/components/list_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/list_panel.jsx index 50ee00fdab..e766841655 100644 --- a/app/javascript/flavours/glitch/features/ui/components/list_panel.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/list_panel.jsx @@ -5,9 +5,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react'; - import { fetchLists } from 'flavours/glitch/actions/lists'; +import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react'; import ColumnLink from './column_link'; diff --git a/app/javascript/flavours/glitch/features/ui/components/media_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/media_modal.jsx index 910464b49a..586595709c 100644 --- a/app/javascript/flavours/glitch/features/ui/components/media_modal.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/media_modal.jsx @@ -7,9 +7,6 @@ import classNames from 'classnames'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import ChevronLeftIcon from '@material-symbols/svg-600/outlined/chevron_left.svg?react'; -import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; import ReactSwipeableViews from 'react-swipeable-views'; import { getAverageFromBlurhash } from 'flavours/glitch/blurhash'; @@ -19,6 +16,9 @@ import { IconButton } from 'flavours/glitch/components/icon_button'; import Footer from 'flavours/glitch/features/picture_in_picture/components/footer'; import Video from 'flavours/glitch/features/video'; import { disableSwiping } from 'flavours/glitch/initial_state'; +import ChevronLeftIcon from 'mastodon/../material-icons/400-24px/chevron_left.svg?react'; +import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; import ImageLoader from './image_loader'; diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx index 709fdedc05..cb5fdc8518 100644 --- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx @@ -3,22 +3,21 @@ import { Component } from 'react'; import { defineMessages, injectIntl } from 'react-intl'; -import BookmarksIcon from '@material-symbols/svg-600/outlined/bookmarks-fill.svg?react'; -import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react'; -import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react'; -import MailIcon from '@material-symbols/svg-600/outlined/mail.svg?react'; -import ManufacturingIcon from '@material-symbols/svg-600/outlined/manufacturing.svg?react'; -import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react'; -import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react'; -import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react'; -import SettingsIcon from '@material-symbols/svg-600/outlined/settings-fill.svg?react'; -import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react'; -import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react'; - import { NavigationPortal } from 'flavours/glitch/components/navigation_portal'; import { timelinePreview, trendsEnabled } from 'flavours/glitch/initial_state'; import { transientSingleColumn } from 'flavours/glitch/is_mobile'; import { preferencesLink } from 'flavours/glitch/utils/backend_links'; +import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react'; +import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react'; +import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react'; +import MailIcon from 'mastodon/../material-icons/400-24px/mail.svg?react'; +import ManufacturingIcon from 'mastodon/../material-icons/400-24px/manufacturing.svg?react'; +import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react'; +import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react'; +import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react'; +import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react'; +import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react'; +import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react'; import ColumnLink from './column_link'; import DisabledAccountBanner from './disabled_account_banner'; diff --git a/app/javascript/flavours/glitch/features/ui/components/notifications_counter_icon.js b/app/javascript/flavours/glitch/features/ui/components/notifications_counter_icon.js index 576d74ad21..cc98a5a1e1 100644 --- a/app/javascript/flavours/glitch/features/ui/components/notifications_counter_icon.js +++ b/app/javascript/flavours/glitch/features/ui/components/notifications_counter_icon.js @@ -1,8 +1,7 @@ import { connect } from 'react-redux'; -import NotificationsIcon from '@material-symbols/svg-600/outlined/notifications-fill.svg?react'; - import { IconWithBadge } from 'flavours/glitch/components/icon_with_badge'; +import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications-fill.svg?react'; const mapStateToProps = state => ({ count: state.getIn(['local_settings', 'notifications', 'tab_badge']) ? state.getIn(['notifications', 'unread']) : 0, diff --git a/app/javascript/flavours/glitch/features/ui/components/report_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/report_modal.jsx index 7d82042c67..09b481c10a 100644 --- a/app/javascript/flavours/glitch/features/ui/components/report_modal.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/report_modal.jsx @@ -7,8 +7,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; - import { fetchRelationships } from 'flavours/glitch/actions/accounts'; import { submitReport } from 'flavours/glitch/actions/reports'; import { fetchServer } from 'flavours/glitch/actions/server'; @@ -20,6 +18,7 @@ import Rules from 'flavours/glitch/features/report/rules'; import Statuses from 'flavours/glitch/features/report/statuses'; import Thanks from 'flavours/glitch/features/report/thanks'; import { makeGetAccount } from 'flavours/glitch/selectors'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' }, diff --git a/app/javascript/flavours/glitch/features/ui/components/zoomable_image.jsx b/app/javascript/flavours/glitch/features/ui/components/zoomable_image.jsx index 32fb2ab1f4..f52b845ad0 100644 --- a/app/javascript/flavours/glitch/features/ui/components/zoomable_image.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/zoomable_image.jsx @@ -3,10 +3,9 @@ import { PureComponent } from 'react'; import { defineMessages, injectIntl } from 'react-intl'; -import FullscreenExitIcon from '@material-symbols/svg-600/outlined/fullscreen_exit.svg?react'; -import RectangleIcon from '@material-symbols/svg-600/outlined/rectangle.svg?react'; - import { IconButton } from 'flavours/glitch/components/icon_button'; +import FullscreenExitIcon from 'mastodon/../material-icons/400-24px/fullscreen_exit.svg?react'; +import RectangleIcon from 'mastodon/../material-icons/400-24px/rectangle.svg?react'; const messages = defineMessages({ compress: { id: 'lightbox.compress', defaultMessage: 'Compress image view box' }, diff --git a/app/javascript/flavours/glitch/features/video/index.jsx b/app/javascript/flavours/glitch/features/video/index.jsx index 9b5b138412..f985781245 100644 --- a/app/javascript/flavours/glitch/features/video/index.jsx +++ b/app/javascript/flavours/glitch/features/video/index.jsx @@ -7,19 +7,19 @@ import classNames from 'classnames'; import { is } from 'immutable'; -import FullscreenIcon from '@material-symbols/svg-600/outlined/fullscreen.svg?react'; -import FullscreenExitIcon from '@material-symbols/svg-600/outlined/fullscreen_exit.svg?react'; -import PauseIcon from '@material-symbols/svg-600/outlined/pause.svg?react'; -import PlayArrowIcon from '@material-symbols/svg-600/outlined/play_arrow-fill.svg?react'; -import RectangleIcon from '@material-symbols/svg-600/outlined/rectangle.svg?react'; -import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react'; -import VolumeOffIcon from '@material-symbols/svg-600/outlined/volume_off-fill.svg?react'; -import VolumeUpIcon from '@material-symbols/svg-600/outlined/volume_up-fill.svg?react'; import { throttle } from 'lodash'; import { Blurhash } from 'flavours/glitch/components/blurhash'; import { Icon } from 'flavours/glitch/components/icon'; import { playerSettings } from 'flavours/glitch/settings'; +import FullscreenIcon from 'mastodon/../material-icons/400-24px/fullscreen.svg?react'; +import FullscreenExitIcon from 'mastodon/../material-icons/400-24px/fullscreen_exit.svg?react'; +import PauseIcon from 'mastodon/../material-icons/400-24px/pause.svg?react'; +import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow-fill.svg?react'; +import RectangleIcon from 'mastodon/../material-icons/400-24px/rectangle.svg?react'; +import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react'; +import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off-fill.svg?react'; +import VolumeUpIcon from 'mastodon/../material-icons/400-24px/volume_up-fill.svg?react'; import { displayMedia, useBlurhash } from '../../initial_state'; import { isFullscreen, requestFullscreen, exitFullscreen } from '../ui/util/fullscreen'; diff --git a/app/javascript/flavours/glitch/styles/components/columns.scss b/app/javascript/flavours/glitch/styles/components/columns.scss index 77835ce823..6429eba810 100644 --- a/app/javascript/flavours/glitch/styles/components/columns.scss +++ b/app/javascript/flavours/glitch/styles/components/columns.scss @@ -241,7 +241,7 @@ $ui-header-height: 55px; align-items: center; gap: 5px; font-size: 16px; - padding: 15px; + padding: 13px; text-decoration: none; overflow: hidden; white-space: nowrap; @@ -353,7 +353,7 @@ $ui-header-height: 55px; gap: 5px; margin: 0; border: 0; - padding: 15px; + padding: 13px; color: inherit; background: transparent; font: inherit; diff --git a/app/javascript/flavours/glitch/styles/components/drawer.scss b/app/javascript/flavours/glitch/styles/components/drawer.scss index 0669eb245c..2b777f89f9 100644 --- a/app/javascript/flavours/glitch/styles/components/drawer.scss +++ b/app/javascript/flavours/glitch/styles/components/drawer.scss @@ -52,7 +52,7 @@ .drawer__tab { display: flex; flex: 1 1 auto; - padding: 15px 5px 13px; + padding: 13px 3px 11px; color: $darker-text-color; text-decoration: none; text-align: center; diff --git a/app/javascript/flavours/glitch/styles/components/misc.scss b/app/javascript/flavours/glitch/styles/components/misc.scss index b72a0a1fa2..abb59d73be 100644 --- a/app/javascript/flavours/glitch/styles/components/misc.scss +++ b/app/javascript/flavours/glitch/styles/components/misc.scss @@ -171,8 +171,8 @@ .icon { flex: 0 0 auto; - width: 20px; - height: 20px; + width: 24px; + height: 24px; aspect-ratio: 1; path { @@ -184,7 +184,7 @@ display: inline-flex; color: $action-button-color; border: 0; - padding: 2px; + padding: 0; border-radius: 4px; background: transparent; cursor: pointer; diff --git a/app/javascript/material-icons/400-24px/attach_file-fill.svg b/app/javascript/material-icons/400-24px/attach_file-fill.svg new file mode 100644 index 0000000000..e719e8fd06 --- /dev/null +++ b/app/javascript/material-icons/400-24px/attach_file-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/attach_file.svg b/app/javascript/material-icons/400-24px/attach_file.svg new file mode 100644 index 0000000000..e719e8fd06 --- /dev/null +++ b/app/javascript/material-icons/400-24px/attach_file.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/brush-fill.svg b/app/javascript/material-icons/400-24px/brush-fill.svg new file mode 100644 index 0000000000..f92d77ab32 --- /dev/null +++ b/app/javascript/material-icons/400-24px/brush-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/brush.svg b/app/javascript/material-icons/400-24px/brush.svg new file mode 100644 index 0000000000..d583fce54d --- /dev/null +++ b/app/javascript/material-icons/400-24px/brush.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/chat-fill.svg b/app/javascript/material-icons/400-24px/chat-fill.svg new file mode 100644 index 0000000000..3a74e02f16 --- /dev/null +++ b/app/javascript/material-icons/400-24px/chat-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/chat.svg b/app/javascript/material-icons/400-24px/chat.svg new file mode 100644 index 0000000000..4d910a87f1 --- /dev/null +++ b/app/javascript/material-icons/400-24px/chat.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/code-fill.svg b/app/javascript/material-icons/400-24px/code-fill.svg new file mode 100644 index 0000000000..8ef5c55cd4 --- /dev/null +++ b/app/javascript/material-icons/400-24px/code-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/code.svg b/app/javascript/material-icons/400-24px/code.svg new file mode 100644 index 0000000000..8ef5c55cd4 --- /dev/null +++ b/app/javascript/material-icons/400-24px/code.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/expand_less-fill.svg b/app/javascript/material-icons/400-24px/expand_less-fill.svg new file mode 100644 index 0000000000..453729655d --- /dev/null +++ b/app/javascript/material-icons/400-24px/expand_less-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/expand_less.svg b/app/javascript/material-icons/400-24px/expand_less.svg new file mode 100644 index 0000000000..453729655d --- /dev/null +++ b/app/javascript/material-icons/400-24px/expand_less.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/forum-fill.svg b/app/javascript/material-icons/400-24px/forum-fill.svg new file mode 100644 index 0000000000..2459058aa3 --- /dev/null +++ b/app/javascript/material-icons/400-24px/forum-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/forum.svg b/app/javascript/material-icons/400-24px/forum.svg new file mode 100644 index 0000000000..6f5d8d7a4d --- /dev/null +++ b/app/javascript/material-icons/400-24px/forum.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/image-fill.svg b/app/javascript/material-icons/400-24px/image-fill.svg new file mode 100644 index 0000000000..ba28ad3534 --- /dev/null +++ b/app/javascript/material-icons/400-24px/image-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/image.svg b/app/javascript/material-icons/400-24px/image.svg new file mode 100644 index 0000000000..0e7c11d402 --- /dev/null +++ b/app/javascript/material-icons/400-24px/image.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/mail-fill.svg b/app/javascript/material-icons/400-24px/mail-fill.svg new file mode 100644 index 0000000000..5e7e4a2fb2 --- /dev/null +++ b/app/javascript/material-icons/400-24px/mail-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/mail.svg b/app/javascript/material-icons/400-24px/mail.svg new file mode 100644 index 0000000000..15e1d12d4e --- /dev/null +++ b/app/javascript/material-icons/400-24px/mail.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/manufacturing-fill.svg b/app/javascript/material-icons/400-24px/manufacturing-fill.svg new file mode 100644 index 0000000000..f19180759c --- /dev/null +++ b/app/javascript/material-icons/400-24px/manufacturing-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/manufacturing.svg b/app/javascript/material-icons/400-24px/manufacturing.svg new file mode 100644 index 0000000000..f19180759c --- /dev/null +++ b/app/javascript/material-icons/400-24px/manufacturing.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/markdown-fill.svg b/app/javascript/material-icons/400-24px/markdown-fill.svg new file mode 100644 index 0000000000..18a0670518 --- /dev/null +++ b/app/javascript/material-icons/400-24px/markdown-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/markdown.svg b/app/javascript/material-icons/400-24px/markdown.svg new file mode 100644 index 0000000000..3396c2f99a --- /dev/null +++ b/app/javascript/material-icons/400-24px/markdown.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/movie-fill.svg b/app/javascript/material-icons/400-24px/movie-fill.svg new file mode 100644 index 0000000000..d295408958 --- /dev/null +++ b/app/javascript/material-icons/400-24px/movie-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/movie.svg b/app/javascript/material-icons/400-24px/movie.svg new file mode 100644 index 0000000000..e98fa48473 --- /dev/null +++ b/app/javascript/material-icons/400-24px/movie.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/person_check-fill.svg b/app/javascript/material-icons/400-24px/person_check-fill.svg new file mode 100644 index 0000000000..21d91f1933 --- /dev/null +++ b/app/javascript/material-icons/400-24px/person_check-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/person_check.svg b/app/javascript/material-icons/400-24px/person_check.svg new file mode 100644 index 0000000000..fbe013ac7b --- /dev/null +++ b/app/javascript/material-icons/400-24px/person_check.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/trip-fill.svg b/app/javascript/material-icons/400-24px/trip-fill.svg new file mode 100644 index 0000000000..97c8c46dad --- /dev/null +++ b/app/javascript/material-icons/400-24px/trip-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/trip.svg b/app/javascript/material-icons/400-24px/trip.svg new file mode 100644 index 0000000000..f158a738c6 --- /dev/null +++ b/app/javascript/material-icons/400-24px/trip.svg @@ -0,0 +1 @@ + \ No newline at end of file