Skip to content

Commit

Permalink
[Glitch] Switch from 48px weight 600 material symbol icons to 24px we…
Browse files Browse the repository at this point in the history
…ight 400 icons

Port 6bbcd93 to glitch-soc

Signed-off-by: Claire <[email protected]>
  • Loading branch information
ClearlyClaire committed Jan 15, 2024
1 parent 2f521bc commit a192042
Show file tree
Hide file tree
Showing 142 changed files with 348 additions and 328 deletions.
4 changes: 2 additions & 2 deletions app/javascript/flavours/glitch/components/attachment_list.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand Down
6 changes: 3 additions & 3 deletions app/javascript/flavours/glitch/components/badge.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) => (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
14 changes: 7 additions & 7 deletions app/javascript/flavours/glitch/components/column_header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion app/javascript/flavours/glitch/components/domain.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
3 changes: 1 addition & 2 deletions app/javascript/flavours/glitch/components/icon.tsx
Original file line number Diff line number Diff line change
@@ -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<SVGSVGElement> {
title?: string;
Expand Down
3 changes: 1 addition & 2 deletions app/javascript/flavours/glitch/components/load_gap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion app/javascript/flavours/glitch/components/poll.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
19 changes: 9 additions & 10 deletions app/javascript/flavours/glitch/components/status_action_bar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
12 changes: 6 additions & 6 deletions app/javascript/flavours/glitch/components/status_content.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
18 changes: 9 additions & 9 deletions app/javascript/flavours/glitch/components/status_icons.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
14 changes: 7 additions & 7 deletions app/javascript/flavours/glitch/components/status_prepend.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
8 changes: 4 additions & 4 deletions app/javascript/flavours/glitch/components/visibility_icon.tsx
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
4 changes: 2 additions & 2 deletions app/javascript/flavours/glitch/features/about/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Loading

0 comments on commit a192042

Please sign in to comment.