Merge remote-tracking branch 'parent/main' into upstream-20240118

This commit is contained in:
KMY 2024-01-18 09:17:39 +09:00
commit 2b51fabe9c
397 changed files with 2899 additions and 3252 deletions
app/javascript/mastodon/features/ui/components

View file

@ -5,19 +5,19 @@ import { defineMessages, injectIntl } from 'react-intl';
import { Link } from 'react-router-dom';
import CirclesIcon from 'mastodon/../material-icons/400-24px/account_circle-fill.svg?react';
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
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 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 AntennaIcon from 'mastodon/../material-icons/400-24px/wifi.svg?react';
import CirclesIcon from '@/material-icons/400-24px/account_circle-fill.svg?react';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import SearchIcon from '@/material-icons/400-24px/search.svg?react';
import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
import TagIcon from '@/material-icons/400-24px/tag.svg?react';
import AntennaIcon from '@/material-icons/400-24px/wifi.svg?react';
import { WordmarkLogo } from 'mastodon/components/logo';
import { NavigationPortal } from 'mastodon/components/navigation_portal';
import { enableDtlMenu, timelinePreview, trendsEnabled, dtlTag, enableLocalTimeline, isHideItem } from 'mastodon/initial_state';