From 6bbcd9348eb9e9afb8b061478f91cfe2ea06b93a Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 12 Jan 2024 21:16:48 +0100 Subject: Switch from 48px weight 600 material symbol icons to 24px weight 400 icons (#28064) --- .../mastodon/components/attachment_list.jsx | 3 +- app/javascript/mastodon/components/badge.jsx | 6 +- .../mastodon/components/column_back_button.tsx | 3 +- .../mastodon/components/column_header.jsx | 13 +- .../mastodon/components/copy_icon_button.jsx | 3 +- .../mastodon/components/dismissable_banner.tsx | 3 +- app/javascript/mastodon/components/domain.tsx | 2 +- .../mastodon/components/dropdown_menu.jsx | 2 +- .../mastodon/components/edited_timestamp/index.jsx | 3 +- app/javascript/mastodon/components/icon.tsx | 3 +- app/javascript/mastodon/components/load_gap.tsx | 3 +- .../mastodon/components/media_gallery.jsx | 2 +- .../components/picture_in_picture_placeholder.jsx | 3 +- app/javascript/mastodon/components/poll.jsx | 2 +- app/javascript/mastodon/components/status.jsx | 8 +- .../mastodon/components/status_action_bar.jsx | 19 +- .../mastodon/components/status_content.jsx | 3 +- .../mastodon/components/verified_badge.tsx | 2 +- .../mastodon/components/visibility_icon.tsx | 8 +- app/javascript/mastodon/features/about/index.jsx | 5 +- .../account/components/follow_request_note.jsx | 5 +- .../features/account/components/header.jsx | 13 +- .../account_gallery/components/media_item.jsx | 7 +- app/javascript/mastodon/features/audio/index.jsx | 12 +- app/javascript/mastodon/features/blocks/index.jsx | 3 +- .../features/bookmarked_statuses/index.jsx | 2 +- .../mastodon/features/community_timeline/index.jsx | 3 +- .../features/compose/components/action_bar.jsx | 2 +- .../features/compose/components/compose_form.jsx | 2 +- .../features/compose/components/poll_button.jsx | 2 +- .../features/compose/components/poll_form.jsx | 5 +- .../compose/components/privacy_dropdown.jsx | 9 +- .../compose/components/reply_indicator.jsx | 3 +- .../features/compose/components/search.jsx | 7 +- .../features/compose/components/search_results.jsx | 9 +- .../features/compose/components/upload.jsx | 6 +- .../features/compose/components/upload_button.jsx | 2 +- .../compose/components/upload_progress.jsx | 2 +- app/javascript/mastodon/features/compose/index.jsx | 14 +- .../direct_timeline/components/conversation.jsx | 4 +- .../mastodon/features/direct_timeline/index.jsx | 3 +- .../mastodon/features/directory/index.jsx | 3 +- .../mastodon/features/domain_blocks/index.jsx | 3 +- app/javascript/mastodon/features/explore/index.jsx | 5 +- .../mastodon/features/explore/results.jsx | 7 +- .../features/favourited_statuses/index.jsx | 2 +- .../mastodon/features/favourites/index.jsx | 2 +- .../mastodon/features/filters/select_filter.jsx | 2 +- .../mastodon/features/firehose/index.jsx | 3 +- .../components/account_authorize.jsx | 4 +- .../mastodon/features/follow_requests/index.jsx | 3 +- .../mastodon/features/followed_tags/index.jsx | 2 +- .../getting_started/components/announcements.jsx | 6 +- .../mastodon/features/getting_started/index.jsx | 23 ++- .../mastodon/features/hashtag_timeline/index.jsx | 2 +- .../mastodon/features/home_timeline/index.jsx | 5 +- .../mastodon/features/interaction_modal/index.jsx | 8 +- .../mastodon/features/keyboard_shortcuts/index.jsx | 3 +- .../features/list_adder/components/list.jsx | 7 +- .../features/list_editor/components/account.jsx | 4 +- .../list_editor/components/edit_list_form.jsx | 2 +- .../features/list_editor/components/search.jsx | 5 +- .../mastodon/features/list_timeline/index.jsx | 6 +- app/javascript/mastodon/features/lists/index.jsx | 3 +- app/javascript/mastodon/features/mutes/index.jsx | 3 +- .../components/clear_column_button.jsx | 3 +- .../notifications/components/filter_bar.jsx | 13 +- .../notifications/components/follow_request.jsx | 5 +- .../notifications/components/notification.jsx | 16 +- .../components/notifications_permission_banner.jsx | 5 +- .../mastodon/features/notifications/index.jsx | 4 +- .../features/onboarding/components/step.jsx | 5 +- .../mastodon/features/onboarding/index.jsx | 11 +- .../mastodon/features/onboarding/profile.jsx | 4 +- .../mastodon/features/onboarding/share.jsx | 4 +- .../picture_in_picture/components/footer.jsx | 11 +- .../picture_in_picture/components/header.jsx | 3 +- .../mastodon/features/pinned_statuses/index.jsx | 3 +- .../mastodon/features/public_timeline/index.jsx | 3 +- app/javascript/mastodon/features/reblogs/index.jsx | 2 +- .../mastodon/features/report/components/option.jsx | 3 +- .../features/status/components/action_bar.jsx | 17 +- .../mastodon/features/status/components/card.jsx | 7 +- .../features/status/components/detailed_status.jsx | 7 +- app/javascript/mastodon/features/status/index.jsx | 4 +- .../features/subscribed_languages_modal/index.jsx | 3 +- .../features/ui/components/boost_modal.jsx | 3 +- .../features/ui/components/bundle_modal_error.jsx | 2 +- .../ui/components/compare_history_modal.jsx | 2 +- .../features/ui/components/embed_modal.jsx | 3 +- .../features/ui/components/filter_modal.jsx | 3 +- .../features/ui/components/focal_point_modal.jsx | 2 +- .../ui/components/follow_requests_column_link.jsx | 3 +- .../mastodon/features/ui/components/header.jsx | 3 +- .../features/ui/components/image_modal.jsx | 3 +- .../mastodon/features/ui/components/list_panel.jsx | 3 +- .../features/ui/components/media_modal.jsx | 6 +- .../features/ui/components/navigation_panel.jsx | 21 +-- .../ui/components/notifications_counter_icon.js | 3 +- .../features/ui/components/report_modal.jsx | 3 +- .../features/ui/components/zoomable_image.jsx | 5 +- app/javascript/mastodon/features/video/index.jsx | 16 +- .../400-24px/account_circle-fill.svg | 1 + .../material-icons/400-24px/account_circle.svg | 1 + .../material-icons/400-24px/add-fill.svg | 1 + app/javascript/material-icons/400-24px/add.svg | 1 + .../400-24px/add_photo_alternate-fill.svg | 1 + .../400-24px/add_photo_alternate.svg | 1 + .../400-24px/alternate_email-fill.svg | 1 + .../material-icons/400-24px/alternate_email.svg | 1 + .../material-icons/400-24px/arrow_back-fill.svg | 1 + .../material-icons/400-24px/arrow_back.svg | 1 + .../400-24px/arrow_drop_down-fill.svg | 1 + .../material-icons/400-24px/arrow_drop_down.svg | 1 + .../400-24px/arrow_right_alt-fill.svg | 1 + .../material-icons/400-24px/arrow_right_alt.svg | 1 + .../material-icons/400-24px/block-fill.svg | 1 + app/javascript/material-icons/400-24px/block.svg | 1 + .../material-icons/400-24px/bookmark-fill.svg | 1 + .../material-icons/400-24px/bookmark.svg | 1 + .../material-icons/400-24px/bookmarks-fill.svg | 1 + .../material-icons/400-24px/bookmarks.svg | 1 + .../material-icons/400-24px/campaign-fill.svg | 1 + .../material-icons/400-24px/campaign.svg | 1 + .../material-icons/400-24px/cancel-fill.svg | 1 + app/javascript/material-icons/400-24px/cancel.svg | 1 + .../400-24px/cancel_presentation-fill.svg | 1 + .../400-24px/cancel_presentation.svg | 1 + .../material-icons/400-24px/check-fill.svg | 1 + app/javascript/material-icons/400-24px/check.svg | 1 + .../400-24px/check_box_outline_blank-fill.svg | 1 + .../400-24px/check_box_outline_blank.svg | 1 + .../material-icons/400-24px/chevron_left-fill.svg | 1 + .../material-icons/400-24px/chevron_left.svg | 1 + .../material-icons/400-24px/chevron_right-fill.svg | 1 + .../material-icons/400-24px/chevron_right.svg | 1 + .../material-icons/400-24px/close-fill.svg | 1 + app/javascript/material-icons/400-24px/close.svg | 1 + .../material-icons/400-24px/content_copy-fill.svg | 1 + .../material-icons/400-24px/content_copy.svg | 1 + .../material-icons/400-24px/delete-fill.svg | 1 + app/javascript/material-icons/400-24px/delete.svg | 1 + .../400-24px/delete_forever-fill.svg | 1 + .../material-icons/400-24px/delete_forever.svg | 1 + .../material-icons/400-24px/description-fill.svg | 1 + .../material-icons/400-24px/description.svg | 1 + .../material-icons/400-24px/done-fill.svg | 1 + app/javascript/material-icons/400-24px/done.svg | 1 + .../material-icons/400-24px/done_all-fill.svg | 1 + .../material-icons/400-24px/done_all.svg | 1 + .../material-icons/400-24px/download-fill.svg | 1 + .../material-icons/400-24px/download.svg | 1 + .../material-icons/400-24px/edit-fill.svg | 1 + app/javascript/material-icons/400-24px/edit.svg | 1 + .../material-icons/400-24px/edit_note-fill.svg | 1 + .../material-icons/400-24px/edit_note.svg | 1 + .../material-icons/400-24px/expand_more-fill.svg | 1 + .../material-icons/400-24px/expand_more.svg | 1 + .../material-icons/400-24px/find_in_page-fill.svg | 1 + .../material-icons/400-24px/find_in_page.svg | 1 + .../material-icons/400-24px/flag-fill.svg | 1 + app/javascript/material-icons/400-24px/flag.svg | 1 + .../material-icons/400-24px/fullscreen-fill.svg | 1 + .../material-icons/400-24px/fullscreen.svg | 1 + .../400-24px/fullscreen_exit-fill.svg | 1 + .../material-icons/400-24px/fullscreen_exit.svg | 1 + .../material-icons/400-24px/group-fill.svg | 1 + app/javascript/material-icons/400-24px/group.svg | 1 + .../material-icons/400-24px/home-fill.svg | 1 + app/javascript/material-icons/400-24px/home.svg | 1 + .../material-icons/400-24px/info-fill.svg | 1 + app/javascript/material-icons/400-24px/info.svg | 1 + .../material-icons/400-24px/insert_chart-fill.svg | 1 + .../material-icons/400-24px/insert_chart.svg | 1 + .../material-icons/400-24px/link-fill.svg | 1 + app/javascript/material-icons/400-24px/link.svg | 1 + .../material-icons/400-24px/list_alt-fill.svg | 1 + .../material-icons/400-24px/list_alt.svg | 1 + .../material-icons/400-24px/lock-fill.svg | 1 + app/javascript/material-icons/400-24px/lock.svg | 1 + .../material-icons/400-24px/lock_open-fill.svg | 1 + .../material-icons/400-24px/lock_open.svg | 1 + .../material-icons/400-24px/logout-fill.svg | 1 + app/javascript/material-icons/400-24px/logout.svg | 1 + .../material-icons/400-24px/menu-fill.svg | 1 + app/javascript/material-icons/400-24px/menu.svg | 1 + .../material-icons/400-24px/more_horiz-fill.svg | 1 + .../material-icons/400-24px/more_horiz.svg | 1 + .../material-icons/400-24px/music_note-fill.svg | 1 + .../material-icons/400-24px/music_note.svg | 1 + .../material-icons/400-24px/notifications-fill.svg | 1 + .../material-icons/400-24px/notifications.svg | 1 + .../400-24px/notifications_active-fill.svg | 1 + .../400-24px/notifications_active.svg | 1 + .../material-icons/400-24px/open_in_new-fill.svg | 1 + .../material-icons/400-24px/open_in_new.svg | 1 + .../material-icons/400-24px/pause-fill.svg | 1 + app/javascript/material-icons/400-24px/pause.svg | 1 + .../material-icons/400-24px/person-fill.svg | 1 + app/javascript/material-icons/400-24px/person.svg | 1 + .../material-icons/400-24px/person_add-fill.svg | 1 + .../material-icons/400-24px/person_add.svg | 1 + .../material-icons/400-24px/play_arrow-fill.svg | 1 + .../material-icons/400-24px/play_arrow.svg | 1 + .../material-icons/400-24px/public-fill.svg | 1 + app/javascript/material-icons/400-24px/public.svg | 1 + .../material-icons/400-24px/push_pin-fill.svg | 1 + .../material-icons/400-24px/push_pin.svg | 1 + .../material-icons/400-24px/rectangle-fill.svg | 1 + .../material-icons/400-24px/rectangle.svg | 1 + .../material-icons/400-24px/refresh-fill.svg | 1 + app/javascript/material-icons/400-24px/refresh.svg | 1 + .../material-icons/400-24px/repeat-fill.svg | 1 + app/javascript/material-icons/400-24px/repeat.svg | 1 + .../material-icons/400-24px/reply-fill.svg | 1 + app/javascript/material-icons/400-24px/reply.svg | 1 + .../material-icons/400-24px/reply_all-fill.svg | 1 + .../material-icons/400-24px/reply_all.svg | 1 + .../material-icons/400-24px/search-fill.svg | 1 + app/javascript/material-icons/400-24px/search.svg | 1 + .../material-icons/400-24px/settings-fill.svg | 1 + .../material-icons/400-24px/settings.svg | 1 + .../material-icons/400-24px/share-fill.svg | 1 + app/javascript/material-icons/400-24px/share.svg | 1 + .../material-icons/400-24px/smart_toy-fill.svg | 1 + .../material-icons/400-24px/smart_toy.svg | 1 + .../material-icons/400-24px/star-fill.svg | 1 + app/javascript/material-icons/400-24px/star.svg | 1 + .../material-icons/400-24px/tag-fill.svg | 1 + app/javascript/material-icons/400-24px/tag.svg | 1 + .../material-icons/400-24px/tune-fill.svg | 1 + app/javascript/material-icons/400-24px/tune.svg | 1 + .../material-icons/400-24px/upload_file-fill.svg | 1 + .../material-icons/400-24px/upload_file.svg | 1 + .../material-icons/400-24px/visibility-fill.svg | 1 + .../material-icons/400-24px/visibility.svg | 1 + .../400-24px/visibility_off-fill.svg | 1 + .../material-icons/400-24px/visibility_off.svg | 1 + .../material-icons/400-24px/volume_off-fill.svg | 1 + .../material-icons/400-24px/volume_off.svg | 1 + .../material-icons/400-24px/volume_up-fill.svg | 1 + .../material-icons/400-24px/volume_up.svg | 1 + app/javascript/material-icons/LICENSE | 202 +++++++++++++++++++++ app/javascript/material-icons/README.md | 1 + app/javascript/styles/mastodon/components.scss | 12 +- config/webpack/rules/file.js | 2 +- config/webpack/rules/material_icons.js | 2 +- lib/tasks/icons.rake | 56 ++++++ package.json | 1 - yarn.lock | 8 - 250 files changed, 649 insertions(+), 313 deletions(-) create mode 100644 app/javascript/material-icons/400-24px/account_circle-fill.svg create mode 100644 app/javascript/material-icons/400-24px/account_circle.svg create mode 100644 app/javascript/material-icons/400-24px/add-fill.svg create mode 100644 app/javascript/material-icons/400-24px/add.svg create mode 100644 app/javascript/material-icons/400-24px/add_photo_alternate-fill.svg create mode 100644 app/javascript/material-icons/400-24px/add_photo_alternate.svg create mode 100644 app/javascript/material-icons/400-24px/alternate_email-fill.svg create mode 100644 app/javascript/material-icons/400-24px/alternate_email.svg create mode 100644 app/javascript/material-icons/400-24px/arrow_back-fill.svg create mode 100644 app/javascript/material-icons/400-24px/arrow_back.svg create mode 100644 app/javascript/material-icons/400-24px/arrow_drop_down-fill.svg create mode 100644 app/javascript/material-icons/400-24px/arrow_drop_down.svg create mode 100644 app/javascript/material-icons/400-24px/arrow_right_alt-fill.svg create mode 100644 app/javascript/material-icons/400-24px/arrow_right_alt.svg create mode 100644 app/javascript/material-icons/400-24px/block-fill.svg create mode 100644 app/javascript/material-icons/400-24px/block.svg create mode 100644 app/javascript/material-icons/400-24px/bookmark-fill.svg create mode 100644 app/javascript/material-icons/400-24px/bookmark.svg create mode 100644 app/javascript/material-icons/400-24px/bookmarks-fill.svg create mode 100644 app/javascript/material-icons/400-24px/bookmarks.svg create mode 100644 app/javascript/material-icons/400-24px/campaign-fill.svg create mode 100644 app/javascript/material-icons/400-24px/campaign.svg create mode 100644 app/javascript/material-icons/400-24px/cancel-fill.svg create mode 100644 app/javascript/material-icons/400-24px/cancel.svg create mode 100644 app/javascript/material-icons/400-24px/cancel_presentation-fill.svg create mode 100644 app/javascript/material-icons/400-24px/cancel_presentation.svg create mode 100644 app/javascript/material-icons/400-24px/check-fill.svg create mode 100644 app/javascript/material-icons/400-24px/check.svg create mode 100644 app/javascript/material-icons/400-24px/check_box_outline_blank-fill.svg create mode 100644 app/javascript/material-icons/400-24px/check_box_outline_blank.svg create mode 100644 app/javascript/material-icons/400-24px/chevron_left-fill.svg create mode 100644 app/javascript/material-icons/400-24px/chevron_left.svg create mode 100644 app/javascript/material-icons/400-24px/chevron_right-fill.svg create mode 100644 app/javascript/material-icons/400-24px/chevron_right.svg create mode 100644 app/javascript/material-icons/400-24px/close-fill.svg create mode 100644 app/javascript/material-icons/400-24px/close.svg create mode 100644 app/javascript/material-icons/400-24px/content_copy-fill.svg create mode 100644 app/javascript/material-icons/400-24px/content_copy.svg create mode 100644 app/javascript/material-icons/400-24px/delete-fill.svg create mode 100644 app/javascript/material-icons/400-24px/delete.svg create mode 100644 app/javascript/material-icons/400-24px/delete_forever-fill.svg create mode 100644 app/javascript/material-icons/400-24px/delete_forever.svg create mode 100644 app/javascript/material-icons/400-24px/description-fill.svg create mode 100644 app/javascript/material-icons/400-24px/description.svg create mode 100644 app/javascript/material-icons/400-24px/done-fill.svg create mode 100644 app/javascript/material-icons/400-24px/done.svg create mode 100644 app/javascript/material-icons/400-24px/done_all-fill.svg create mode 100644 app/javascript/material-icons/400-24px/done_all.svg create mode 100644 app/javascript/material-icons/400-24px/download-fill.svg create mode 100644 app/javascript/material-icons/400-24px/download.svg create mode 100644 app/javascript/material-icons/400-24px/edit-fill.svg create mode 100644 app/javascript/material-icons/400-24px/edit.svg create mode 100644 app/javascript/material-icons/400-24px/edit_note-fill.svg create mode 100644 app/javascript/material-icons/400-24px/edit_note.svg create mode 100644 app/javascript/material-icons/400-24px/expand_more-fill.svg create mode 100644 app/javascript/material-icons/400-24px/expand_more.svg create mode 100644 app/javascript/material-icons/400-24px/find_in_page-fill.svg create mode 100644 app/javascript/material-icons/400-24px/find_in_page.svg create mode 100644 app/javascript/material-icons/400-24px/flag-fill.svg create mode 100644 app/javascript/material-icons/400-24px/flag.svg create mode 100644 app/javascript/material-icons/400-24px/fullscreen-fill.svg create mode 100644 app/javascript/material-icons/400-24px/fullscreen.svg create mode 100644 app/javascript/material-icons/400-24px/fullscreen_exit-fill.svg create mode 100644 app/javascript/material-icons/400-24px/fullscreen_exit.svg create mode 100644 app/javascript/material-icons/400-24px/group-fill.svg create mode 100644 app/javascript/material-icons/400-24px/group.svg create mode 100644 app/javascript/material-icons/400-24px/home-fill.svg create mode 100644 app/javascript/material-icons/400-24px/home.svg create mode 100644 app/javascript/material-icons/400-24px/info-fill.svg create mode 100644 app/javascript/material-icons/400-24px/info.svg create mode 100644 app/javascript/material-icons/400-24px/insert_chart-fill.svg create mode 100644 app/javascript/material-icons/400-24px/insert_chart.svg create mode 100644 app/javascript/material-icons/400-24px/link-fill.svg create mode 100644 app/javascript/material-icons/400-24px/link.svg create mode 100644 app/javascript/material-icons/400-24px/list_alt-fill.svg create mode 100644 app/javascript/material-icons/400-24px/list_alt.svg create mode 100644 app/javascript/material-icons/400-24px/lock-fill.svg create mode 100644 app/javascript/material-icons/400-24px/lock.svg create mode 100644 app/javascript/material-icons/400-24px/lock_open-fill.svg create mode 100644 app/javascript/material-icons/400-24px/lock_open.svg create mode 100644 app/javascript/material-icons/400-24px/logout-fill.svg create mode 100644 app/javascript/material-icons/400-24px/logout.svg create mode 100644 app/javascript/material-icons/400-24px/menu-fill.svg create mode 100644 app/javascript/material-icons/400-24px/menu.svg create mode 100644 app/javascript/material-icons/400-24px/more_horiz-fill.svg create mode 100644 app/javascript/material-icons/400-24px/more_horiz.svg create mode 100644 app/javascript/material-icons/400-24px/music_note-fill.svg create mode 100644 app/javascript/material-icons/400-24px/music_note.svg create mode 100644 app/javascript/material-icons/400-24px/notifications-fill.svg create mode 100644 app/javascript/material-icons/400-24px/notifications.svg create mode 100644 app/javascript/material-icons/400-24px/notifications_active-fill.svg create mode 100644 app/javascript/material-icons/400-24px/notifications_active.svg create mode 100644 app/javascript/material-icons/400-24px/open_in_new-fill.svg create mode 100644 app/javascript/material-icons/400-24px/open_in_new.svg create mode 100644 app/javascript/material-icons/400-24px/pause-fill.svg create mode 100644 app/javascript/material-icons/400-24px/pause.svg create mode 100644 app/javascript/material-icons/400-24px/person-fill.svg create mode 100644 app/javascript/material-icons/400-24px/person.svg create mode 100644 app/javascript/material-icons/400-24px/person_add-fill.svg create mode 100644 app/javascript/material-icons/400-24px/person_add.svg create mode 100644 app/javascript/material-icons/400-24px/play_arrow-fill.svg create mode 100644 app/javascript/material-icons/400-24px/play_arrow.svg create mode 100644 app/javascript/material-icons/400-24px/public-fill.svg create mode 100644 app/javascript/material-icons/400-24px/public.svg create mode 100644 app/javascript/material-icons/400-24px/push_pin-fill.svg create mode 100644 app/javascript/material-icons/400-24px/push_pin.svg create mode 100644 app/javascript/material-icons/400-24px/rectangle-fill.svg create mode 100644 app/javascript/material-icons/400-24px/rectangle.svg create mode 100644 app/javascript/material-icons/400-24px/refresh-fill.svg create mode 100644 app/javascript/material-icons/400-24px/refresh.svg create mode 100644 app/javascript/material-icons/400-24px/repeat-fill.svg create mode 100644 app/javascript/material-icons/400-24px/repeat.svg create mode 100644 app/javascript/material-icons/400-24px/reply-fill.svg create mode 100644 app/javascript/material-icons/400-24px/reply.svg create mode 100644 app/javascript/material-icons/400-24px/reply_all-fill.svg create mode 100644 app/javascript/material-icons/400-24px/reply_all.svg create mode 100644 app/javascript/material-icons/400-24px/search-fill.svg create mode 100644 app/javascript/material-icons/400-24px/search.svg create mode 100644 app/javascript/material-icons/400-24px/settings-fill.svg create mode 100644 app/javascript/material-icons/400-24px/settings.svg create mode 100644 app/javascript/material-icons/400-24px/share-fill.svg create mode 100644 app/javascript/material-icons/400-24px/share.svg create mode 100644 app/javascript/material-icons/400-24px/smart_toy-fill.svg create mode 100644 app/javascript/material-icons/400-24px/smart_toy.svg create mode 100644 app/javascript/material-icons/400-24px/star-fill.svg create mode 100644 app/javascript/material-icons/400-24px/star.svg create mode 100644 app/javascript/material-icons/400-24px/tag-fill.svg create mode 100644 app/javascript/material-icons/400-24px/tag.svg create mode 100644 app/javascript/material-icons/400-24px/tune-fill.svg create mode 100644 app/javascript/material-icons/400-24px/tune.svg create mode 100644 app/javascript/material-icons/400-24px/upload_file-fill.svg create mode 100644 app/javascript/material-icons/400-24px/upload_file.svg create mode 100644 app/javascript/material-icons/400-24px/visibility-fill.svg create mode 100644 app/javascript/material-icons/400-24px/visibility.svg create mode 100644 app/javascript/material-icons/400-24px/visibility_off-fill.svg create mode 100644 app/javascript/material-icons/400-24px/visibility_off.svg create mode 100644 app/javascript/material-icons/400-24px/volume_off-fill.svg create mode 100644 app/javascript/material-icons/400-24px/volume_off.svg create mode 100644 app/javascript/material-icons/400-24px/volume_up-fill.svg create mode 100644 app/javascript/material-icons/400-24px/volume_up.svg create mode 100644 app/javascript/material-icons/LICENSE create mode 100644 app/javascript/material-icons/README.md create mode 100644 lib/tasks/icons.rake diff --git a/app/javascript/mastodon/components/attachment_list.jsx b/app/javascript/mastodon/components/attachment_list.jsx index e912d515cd5..59d31a3038d 100644 --- a/app/javascript/mastodon/components/attachment_list.jsx +++ b/app/javascript/mastodon/components/attachment_list.jsx @@ -7,8 +7,7 @@ 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 LinkIcon from 'mastodon/../material-icons/400-24px/link.svg?react'; import { Icon } from 'mastodon/components/icon'; const filename = url => url.split('/').pop().split('#')[0].split('?')[0]; diff --git a/app/javascript/mastodon/components/badge.jsx b/app/javascript/mastodon/components/badge.jsx index e7164217109..bac80965665 100644 --- a/app/javascript/mastodon/components/badge.jsx +++ b/app/javascript/mastodon/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/mastodon/components/column_back_button.tsx b/app/javascript/mastodon/components/column_back_button.tsx index 7a23c4e1080..f803f862893 100644 --- a/app/javascript/mastodon/components/column_back_button.tsx +++ b/app/javascript/mastodon/components/column_back_button.tsx @@ -2,8 +2,7 @@ import { useCallback } from 'react'; import { FormattedMessage } from 'react-intl'; -import ArrowBackIcon from '@material-symbols/svg-600/outlined/arrow_back.svg?react'; - +import ArrowBackIcon from 'mastodon/../material-icons/400-24px/arrow_back.svg?react'; import { Icon } from 'mastodon/components/icon'; import { ButtonInTabsBar } from 'mastodon/features/ui/util/columns_context'; diff --git a/app/javascript/mastodon/components/column_header.jsx b/app/javascript/mastodon/components/column_header.jsx index a0ce10bf17f..3e53902de63 100644 --- a/app/javascript/mastodon/components/column_header.jsx +++ b/app/javascript/mastodon/components/column_header.jsx @@ -6,13 +6,12 @@ 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 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 { Icon } from 'mastodon/components/icon'; import { ButtonInTabsBar, useColumnsContext } from 'mastodon/features/ui/util/columns_context'; import { WithRouterPropTypes } from 'mastodon/utils/react_router'; diff --git a/app/javascript/mastodon/components/copy_icon_button.jsx b/app/javascript/mastodon/components/copy_icon_button.jsx index 0c250a7632a..c5216e8f800 100644 --- a/app/javascript/mastodon/components/copy_icon_button.jsx +++ b/app/javascript/mastodon/components/copy_icon_button.jsx @@ -7,8 +7,7 @@ import classNames from 'classnames'; import { useDispatch } from 'react-redux'; -import ContentCopyIcon from '@material-symbols/svg-600/outlined/content_copy.svg?react'; - +import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react'; import { showAlert } from 'mastodon/actions/alerts'; import { IconButton } from 'mastodon/components/icon_button'; diff --git a/app/javascript/mastodon/components/dismissable_banner.tsx b/app/javascript/mastodon/components/dismissable_banner.tsx index c35fec983dd..d3bc28b9b96 100644 --- a/app/javascript/mastodon/components/dismissable_banner.tsx +++ b/app/javascript/mastodon/components/dismissable_banner.tsx @@ -8,8 +8,7 @@ import { useCallback, useState, useEffect } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react'; - +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; import { changeSetting } from 'mastodon/actions/settings'; import { bannerSettings } from 'mastodon/settings'; import { useAppSelector, useAppDispatch } from 'mastodon/store'; diff --git a/app/javascript/mastodon/components/domain.tsx b/app/javascript/mastodon/components/domain.tsx index 26cc77604e4..637c286ce47 100644 --- a/app/javascript/mastodon/components/domain.tsx +++ b/app/javascript/mastodon/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/mastodon/components/dropdown_menu.jsx b/app/javascript/mastodon/components/dropdown_menu.jsx index 1cb5c03150b..a8fcfd10978 100644 --- a/app/javascript/mastodon/components/dropdown_menu.jsx +++ b/app/javascript/mastodon/components/dropdown_menu.jsx @@ -6,10 +6,10 @@ 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 CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; import { CircularProgress } from 'mastodon/components/circular_progress'; import { WithRouterPropTypes } from 'mastodon/utils/react_router'; diff --git a/app/javascript/mastodon/components/edited_timestamp/index.jsx b/app/javascript/mastodon/components/edited_timestamp/index.jsx index de4c641cfb4..7497ab9922d 100644 --- a/app/javascript/mastodon/components/edited_timestamp/index.jsx +++ b/app/javascript/mastodon/components/edited_timestamp/index.jsx @@ -5,8 +5,7 @@ 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 ArrowDropDownIcon from 'mastodon/../material-icons/400-24px/arrow_drop_down.svg?react'; import { openModal } from 'mastodon/actions/modal'; import { Icon } from 'mastodon/components/icon'; import InlineAccount from 'mastodon/components/inline_account'; diff --git a/app/javascript/mastodon/components/icon.tsx b/app/javascript/mastodon/components/icon.tsx index 4b17f063b99..948492d91c2 100644 --- a/app/javascript/mastodon/components/icon.tsx +++ b/app/javascript/mastodon/components/icon.tsx @@ -1,7 +1,6 @@ import classNames from 'classnames'; -import CheckBoxOutlineBlankIcon from '@material-symbols/svg-600/outlined/check_box_outline_blank.svg?react'; - +import CheckBoxOutlineBlankIcon from 'mastodon/../material-icons/400-24px/check_box_outline_blank.svg?react'; import { isProduction } from 'mastodon/utils/environment'; interface SVGPropsWithTitle extends React.SVGProps { diff --git a/app/javascript/mastodon/components/load_gap.tsx b/app/javascript/mastodon/components/load_gap.tsx index ea97c3eb570..2a233b6a1cd 100644 --- a/app/javascript/mastodon/components/load_gap.tsx +++ b/app/javascript/mastodon/components/load_gap.tsx @@ -2,8 +2,7 @@ import { useCallback } from 'react'; import { useIntl, defineMessages } from 'react-intl'; -import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react'; - +import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react'; import { Icon } from 'mastodon/components/icon'; const messages = defineMessages({ diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx index 72daeea5a09..c387bb86989 100644 --- a/app/javascript/mastodon/components/media_gallery.jsx +++ b/app/javascript/mastodon/components/media_gallery.jsx @@ -8,9 +8,9 @@ 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 VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react'; import { Blurhash } from 'mastodon/components/blurhash'; import { autoPlayGif, displayMedia, useBlurhash } from '../initial_state'; diff --git a/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx b/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx index 3ce5ea5a74f..e8cfe6cb321 100644 --- a/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx +++ b/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx @@ -5,8 +5,7 @@ import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; -import CancelPresentationIcon from '@material-symbols/svg-600/outlined/cancel_presentation.svg?react'; - +import CancelPresentationIcon from 'mastodon/../material-icons/400-24px/cancel_presentation.svg?react'; import { removePictureInPicture } from 'mastodon/actions/picture_in_picture'; import { Icon } from 'mastodon/components/icon'; diff --git a/app/javascript/mastodon/components/poll.jsx b/app/javascript/mastodon/components/poll.jsx index b8f64464099..f85c47bb402 100644 --- a/app/javascript/mastodon/components/poll.jsx +++ b/app/javascript/mastodon/components/poll.jsx @@ -7,10 +7,10 @@ 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 CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react'; import { Icon } from 'mastodon/components/icon'; import emojify from 'mastodon/features/emoji/emoji'; import Motion from 'mastodon/features/ui/util/optional_motion'; diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx index f1ea369610a..224c8baded3 100644 --- a/app/javascript/mastodon/components/status.jsx +++ b/app/javascript/mastodon/components/status.jsx @@ -7,12 +7,12 @@ import classNames from 'classnames'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.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 ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react'; import { HotKeys } from 'react-hotkeys'; +import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.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 ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react'; import { Icon } from 'mastodon/components/icon'; import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder'; import { withOptionalRouter, WithOptionalRouterPropTypes } from 'mastodon/utils/react_router'; diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx index 536ea350ae9..e1e0164642f 100644 --- a/app/javascript/mastodon/components/status_action_bar.jsx +++ b/app/javascript/mastodon/components/status_action_bar.jsx @@ -9,16 +9,15 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import BookmarkIcon from '@material-symbols/svg-600/outlined/bookmark-fill.svg'; -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 BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg'; +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?react'; import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg?react'; import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions'; diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx index f8ca0b30434..6f28f6d6d52 100644 --- a/app/javascript/mastodon/components/status_content.jsx +++ b/app/javascript/mastodon/components/status_content.jsx @@ -9,8 +9,7 @@ import { Link, withRouter } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { connect } from 'react-redux'; -import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react'; - +import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react'; import { Icon } from 'mastodon/components/icon'; import PollContainer from 'mastodon/containers/poll_container'; import { autoPlayGif, languages as preloadedLanguages } from 'mastodon/initial_state'; diff --git a/app/javascript/mastodon/components/verified_badge.tsx b/app/javascript/mastodon/components/verified_badge.tsx index add7c7acdf8..4209f68319f 100644 --- a/app/javascript/mastodon/components/verified_badge.tsx +++ b/app/javascript/mastodon/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/mastodon/components/visibility_icon.tsx b/app/javascript/mastodon/components/visibility_icon.tsx index e0ef1372f13..1a752614276 100644 --- a/app/javascript/mastodon/components/visibility_icon.tsx +++ b/app/javascript/mastodon/components/visibility_icon.tsx @@ -1,9 +1,9 @@ import { defineMessages, useIntl } from 'react-intl'; -import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react'; -import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react'; -import LockOpenIcon from '@material-symbols/svg-600/outlined/lock_open.svg?react'; -import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react'; +import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.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 PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react'; import { Icon } from './icon'; diff --git a/app/javascript/mastodon/features/about/index.jsx b/app/javascript/mastodon/features/about/index.jsx index 1e43aaea7be..bffac6357a9 100644 --- a/app/javascript/mastodon/features/about/index.jsx +++ b/app/javascript/mastodon/features/about/index.jsx @@ -10,9 +10,8 @@ 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 ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react'; +import ExpandMoreIcon from 'mastodon/../material-icons/400-24px/expand_more.svg?react'; import { fetchServer, fetchExtendedDescription, fetchDomainBlocks } from 'mastodon/actions/server'; import Column from 'mastodon/components/column'; import { Icon } from 'mastodon/components/icon'; diff --git a/app/javascript/mastodon/features/account/components/follow_request_note.jsx b/app/javascript/mastodon/features/account/components/follow_request_note.jsx index da775248ceb..a8b61f9eaf8 100644 --- a/app/javascript/mastodon/features/account/components/follow_request_note.jsx +++ b/app/javascript/mastodon/features/account/components/follow_request_note.jsx @@ -3,9 +3,8 @@ 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 CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; import { Icon } from 'mastodon/components/icon'; export default class FollowRequestNote extends ImmutablePureComponent { diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx index e8b5e72145f..6f58ae35f1c 100644 --- a/app/javascript/mastodon/features/account/components/header.jsx +++ b/app/javascript/mastodon/features/account/components/header.jsx @@ -9,13 +9,12 @@ import { NavLink, 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 ShareIcon from '@material-symbols/svg-600/outlined/share.svg?react'; - +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 ShareIcon from 'mastodon/../material-icons/400-24px/share.svg?react'; import { Avatar } from 'mastodon/components/avatar'; import { Badge, AutomatedBadge, GroupBadge } from 'mastodon/components/badge'; import { Button } from 'mastodon/components/button'; diff --git a/app/javascript/mastodon/features/account_gallery/components/media_item.jsx b/app/javascript/mastodon/features/account_gallery/components/media_item.jsx index e4495601f55..a35092893d9 100644 --- a/app/javascript/mastodon/features/account_gallery/components/media_item.jsx +++ b/app/javascript/mastodon/features/account_gallery/components/media_item.jsx @@ -5,10 +5,9 @@ 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 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'; import { Blurhash } from 'mastodon/components/blurhash'; import { Icon } from 'mastodon/components/icon'; import { autoPlayGif, displayMedia, useBlurhash } from 'mastodon/initial_state'; diff --git a/app/javascript/mastodon/features/audio/index.jsx b/app/javascript/mastodon/features/audio/index.jsx index 881e5cef1b1..9008e053830 100644 --- a/app/javascript/mastodon/features/audio/index.jsx +++ b/app/javascript/mastodon/features/audio/index.jsx @@ -7,14 +7,14 @@ 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 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 { Icon } from 'mastodon/components/icon'; import { formatTime, getPointerPosition, fileNameFromURL } from 'mastodon/features/video'; diff --git a/app/javascript/mastodon/features/blocks/index.jsx b/app/javascript/mastodon/features/blocks/index.jsx index 7e1eda8aca7..656784664f1 100644 --- a/app/javascript/mastodon/features/blocks/index.jsx +++ b/app/javascript/mastodon/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/mastodon/features/bookmarked_statuses/index.jsx b/app/javascript/mastodon/features/bookmarked_statuses/index.jsx index 767707755b7..15db945956b 100644 --- a/app/javascript/mastodon/features/bookmarked_statuses/index.jsx +++ b/app/javascript/mastodon/features/bookmarked_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 BookmarksIcon from '@material-symbols/svg-600/outlined/bookmarks-fill.svg?react'; import { debounce } from 'lodash'; +import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react'; import { fetchBookmarkedStatuses, expandBookmarkedStatuses } from 'mastodon/actions/bookmarks'; import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns'; import ColumnHeader from 'mastodon/components/column_header'; diff --git a/app/javascript/mastodon/features/community_timeline/index.jsx b/app/javascript/mastodon/features/community_timeline/index.jsx index 1862cdf902c..5bf66c2a342 100644 --- a/app/javascript/mastodon/features/community_timeline/index.jsx +++ b/app/javascript/mastodon/features/community_timeline/index.jsx @@ -7,8 +7,7 @@ import { Helmet } from 'react-helmet'; import { connect } from 'react-redux'; -import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react'; - +import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react'; import { DismissableBanner } from 'mastodon/components/dismissable_banner'; import { domain } from 'mastodon/initial_state'; diff --git a/app/javascript/mastodon/features/compose/components/action_bar.jsx b/app/javascript/mastodon/features/compose/components/action_bar.jsx index 42ed78578a3..bacafaf1e13 100644 --- a/app/javascript/mastodon/features/compose/components/action_bar.jsx +++ b/app/javascript/mastodon/features/compose/components/action_bar.jsx @@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import MenuIcon from '@material-symbols/svg-600/outlined/menu.svg?react'; +import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react'; import DropdownMenuContainer from '../../../containers/dropdown_menu_container'; diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx index 1570bd4d067..a099707dfbc 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.jsx +++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx @@ -8,9 +8,9 @@ import classNames from 'classnames'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react'; import { length } from 'stringz'; +import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react'; import { Icon } from 'mastodon/components/icon'; import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router'; diff --git a/app/javascript/mastodon/features/compose/components/poll_button.jsx b/app/javascript/mastodon/features/compose/components/poll_button.jsx index a5025a0f402..e6ecba1a07f 100644 --- a/app/javascript/mastodon/features/compose/components/poll_button.jsx +++ b/app/javascript/mastodon/features/compose/components/poll_button.jsx @@ -3,7 +3,7 @@ import { PureComponent } from 'react'; import { defineMessages, injectIntl } from 'react-intl'; -import InsertChartIcon from '@material-symbols/svg-600/outlined/insert_chart.svg?react'; +import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react'; import { IconButton } from '../../../components/icon_button'; diff --git a/app/javascript/mastodon/features/compose/components/poll_form.jsx b/app/javascript/mastodon/features/compose/components/poll_form.jsx index 89596815eca..1815e22e6f8 100644 --- a/app/javascript/mastodon/features/compose/components/poll_form.jsx +++ b/app/javascript/mastodon/features/compose/components/poll_form.jsx @@ -8,9 +8,8 @@ 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 AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react'; +import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; import AutosuggestInput from 'mastodon/components/autosuggest_input'; import { Icon } from 'mastodon/components/icon'; import { IconButton } from 'mastodon/components/icon_button'; diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx index 0dbbcbc2561..67298c8c438 100644 --- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx +++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx @@ -6,14 +6,13 @@ import { injectIntl, defineMessages } from 'react-intl'; import classNames from 'classnames'; -import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react'; -import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react'; -import LockOpenIcon from '@material-symbols/svg-600/outlined/lock_open.svg?react'; -import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react'; import { supportsPassiveEvents } from 'detect-passive-events'; import Overlay from 'react-overlays/Overlay'; - +import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.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 PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react'; import { Icon } from 'mastodon/components/icon'; import { IconButton } from '../../../components/icon_button'; diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx index 40e79cafaa0..f16a37347c0 100644 --- a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx +++ b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx @@ -5,8 +5,7 @@ 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 CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react'; import AttachmentList from 'mastodon/components/attachment_list'; import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router'; diff --git a/app/javascript/mastodon/features/compose/components/search.jsx b/app/javascript/mastodon/features/compose/components/search.jsx index 8dbbb0383de..844958bab6c 100644 --- a/app/javascript/mastodon/features/compose/components/search.jsx +++ b/app/javascript/mastodon/features/compose/components/search.jsx @@ -8,10 +8,9 @@ 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 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'; import { Icon } from 'mastodon/components/icon'; import { domain, searchEnabled } from 'mastodon/initial_state'; import { HASHTAG_REGEX } from 'mastodon/utils/hashtags'; diff --git a/app/javascript/mastodon/features/compose/components/search_results.jsx b/app/javascript/mastodon/features/compose/components/search_results.jsx index 00d4dc53292..8a63a01c895 100644 --- a/app/javascript/mastodon/features/compose/components/search_results.jsx +++ b/app/javascript/mastodon/features/compose/components/search_results.jsx @@ -5,11 +5,10 @@ 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 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 { Icon } from 'mastodon/components/icon'; import { LoadMore } from 'mastodon/components/load_more'; import { SearchSection } from 'mastodon/features/explore/components/search_section'; diff --git a/app/javascript/mastodon/features/compose/components/upload.jsx b/app/javascript/mastodon/features/compose/components/upload.jsx index 88d6f68b54d..cb31145e8d4 100644 --- a/app/javascript/mastodon/features/compose/components/upload.jsx +++ b/app/javascript/mastodon/features/compose/components/upload.jsx @@ -5,11 +5,11 @@ 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 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 { Icon } from 'mastodon/components/icon'; import Motion from '../../ui/util/optional_motion'; diff --git a/app/javascript/mastodon/features/compose/components/upload_button.jsx b/app/javascript/mastodon/features/compose/components/upload_button.jsx index 201b1b8983c..090af86b279 100644 --- a/app/javascript/mastodon/features/compose/components/upload_button.jsx +++ b/app/javascript/mastodon/features/compose/components/upload_button.jsx @@ -6,7 +6,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import AddPhotoAlternateIcon from '@material-symbols/svg-600/outlined/add_photo_alternate.svg?react'; +import AddPhotoAlternateIcon from 'mastodon/../material-icons/400-24px/add_photo_alternate.svg?react'; import { IconButton } from '../../../components/icon_button'; diff --git a/app/javascript/mastodon/features/compose/components/upload_progress.jsx b/app/javascript/mastodon/features/compose/components/upload_progress.jsx index 2c44ac6364d..8ed09b36ba1 100644 --- a/app/javascript/mastodon/features/compose/components/upload_progress.jsx +++ b/app/javascript/mastodon/features/compose/components/upload_progress.jsx @@ -3,9 +3,9 @@ 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 UploadFileIcon from 'mastodon/../material-icons/400-24px/upload_file.svg?react'; import { Icon } from 'mastodon/components/icon'; import Motion from '../../ui/util/optional_motion'; diff --git a/app/javascript/mastodon/features/compose/index.jsx b/app/javascript/mastodon/features/compose/index.jsx index 0b9fa65fe13..a19ae71e8ef 100644 --- a/app/javascript/mastodon/features/compose/index.jsx +++ b/app/javascript/mastodon/features/compose/index.jsx @@ -9,15 +9,15 @@ import { Link } from 'react-router-dom'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { connect } from 'react-redux'; -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 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 SettingsIcon from '@material-symbols/svg-600/outlined/settings-fill.svg?react'; import spring from 'react-motion/lib/spring'; +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 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'; +import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react'; import { openModal } from 'mastodon/actions/moda