Browse Source

change star icon to heart

closed-social-glitch-2
欧醚 1 year ago
parent
commit
053352e042
22 changed files with 24 additions and 24 deletions
  1. +1
    -1
      app/javascript/flavours/glitch/components/status_action_bar.jsx
  2. +1
    -1
      app/javascript/flavours/glitch/components/status_prepend.jsx
  3. +1
    -1
      app/javascript/flavours/glitch/features/favourited_statuses/index.jsx
  4. +1
    -1
      app/javascript/flavours/glitch/features/favourites/index.jsx
  5. +1
    -1
      app/javascript/flavours/glitch/features/getting_started_misc/index.jsx
  6. +1
    -1
      app/javascript/flavours/glitch/features/interaction_modal/index.jsx
  7. +1
    -1
      app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx
  8. +1
    -1
      app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
  9. +1
    -1
      app/javascript/flavours/glitch/features/status/components/action_bar.jsx
  10. +2
    -2
      app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
  11. +1
    -1
      app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx
  12. +1
    -1
      app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
  13. +1
    -1
      app/javascript/mastodon/components/status_action_bar.jsx
  14. +1
    -1
      app/javascript/mastodon/features/favourited_statuses/index.jsx
  15. +1
    -1
      app/javascript/mastodon/features/getting_started/index.jsx
  16. +1
    -1
      app/javascript/mastodon/features/interaction_modal/index.jsx
  17. +1
    -1
      app/javascript/mastodon/features/notifications/components/filter_bar.jsx
  18. +1
    -1
      app/javascript/mastodon/features/notifications/components/notification.jsx
  19. +1
    -1
      app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
  20. +1
    -1
      app/javascript/mastodon/features/status/components/action_bar.jsx
  21. +2
    -2
      app/javascript/mastodon/features/status/components/detailed_status.jsx
  22. +1
    -1
      app/javascript/mastodon/features/ui/components/navigation_panel.jsx

+ 1
- 1
app/javascript/flavours/glitch/components/status_action_bar.jsx View File

@ -310,7 +310,7 @@ class StatusActionBar extends ImmutablePureComponent {
obfuscateCount
/>
<IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon={reblogIcon} onClick={this.handleReblogClick} counter={withCounters ? status.get('reblogs_count') : undefined} />
<IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={withCounters ? status.get('favourites_count') : undefined} />
<IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='heart' onClick={this.handleFavouriteClick} counter={withCounters ? status.get('favourites_count') : undefined} />
{shareButton}
<IconButton className='status__action-bar-button bookmark-icon' disabled={anonymousAccess} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} />

+ 1
- 1
app/javascript/flavours/glitch/components/status_prepend.jsx View File

@ -108,7 +108,7 @@ export default class StatusPrepend extends React.PureComponent {
switch(type) {
case 'favourite':
iconId = 'star';
iconId = 'heart';
break;
case 'featured':
iconId = 'thumb-tack';

+ 1
- 1
app/javascript/flavours/glitch/features/favourited_statuses/index.jsx View File

@ -74,7 +74,7 @@ class Favourites extends ImmutablePureComponent {
return (
<Column bindToDocument={!multiColumn} ref={this.setRef} name='favourites' label={intl.formatMessage(messages.heading)}>
<ColumnHeader
icon='star'
icon='heart'
title={intl.formatMessage(messages.heading)}
onPin={this.handlePin}
onMove={this.handleMove}

+ 1
- 1
app/javascript/flavours/glitch/features/favourites/index.jsx View File

@ -72,7 +72,7 @@ class Favourites extends ImmutablePureComponent {
return (
<Column ref={this.setRef}>
<ColumnHeader
icon='star'
icon='heart'
title={intl.formatMessage(messages.heading)}
onClick={this.handleHeaderClick}
showBackButton

+ 1
- 1
app/javascript/flavours/glitch/features/getting_started_misc/index.jsx View File

@ -52,7 +52,7 @@ class GettingStartedMisc extends ImmutablePureComponent {
<div className='scrollable'>
<ColumnSubheading text={intl.formatMessage(messages.subheading)} />
{signedIn && (<ColumnLink key='favourites' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />)}
{signedIn && (<ColumnLink key='favourites' icon='heart' text={intl.formatMessage(messages.favourites)} to='/favourites' />)}
{signedIn && (<ColumnLink key='pinned' icon='thumb-tack' text={intl.formatMessage(messages.pins)} to='/pinned' />)}
{signedIn && (<ColumnLink key='featured_users' icon='users' text={intl.formatMessage(messages.featured_users)} onClick={this.openFeaturedAccountsModal} />)}
{signedIn && (<ColumnLink key='mutes' icon='volume-off' text={intl.formatMessage(messages.mutes)} to='/mutes' />)}

+ 1
- 1
app/javascript/flavours/glitch/features/interaction_modal/index.jsx View File

@ -106,7 +106,7 @@ class InteractionModal extends React.PureComponent {
actionDescription = <FormattedMessage id='interaction_modal.description.reblog' defaultMessage='With an account on Mastodon, you can boost this post to share it with your own followers.' />;
break;
case 'favourite':
icon = <Icon id='star' />;
icon = <Icon id='heart' />;
title = <FormattedMessage id='interaction_modal.title.favourite' defaultMessage="Favourite {name}'s post" values={{ name }} />;
actionDescription = <FormattedMessage id='interaction_modal.description.favourite' defaultMessage='With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.' />;
break;

+ 1
- 1
app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx View File

@ -71,7 +71,7 @@ class FilterBar extends React.PureComponent {
onClick={this.onClick('favourite')}
title={intl.formatMessage(tooltips.favourites)}
>
<Icon id='star' fixedWidth />
<Icon id='heart' fixedWidth />
</button>
<button
className={selectedFilter === 'reblog' ? 'active' : ''}

+ 1
- 1
app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx View File

@ -206,7 +206,7 @@ class Footer extends ImmutablePureComponent {
<div className='picture-in-picture__footer'>
{replyButton}
<IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={status.get('reblogs_count')} />
<IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} />
<IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='heart' onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} />
{withOpenButton && <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.open)} icon='external-link' onClick={this.handleOpenClick} href={status.get('url')} />}
</div>
);

+ 1
- 1
app/javascript/flavours/glitch/features/status/components/action_bar.jsx View File

@ -215,7 +215,7 @@ class ActionBar extends React.PureComponent {
<div className='detailed-status__action-bar'>
<div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_id', null) === null ? 'reply' : 'reply-all'} onClick={this.handleReplyClick} /></div>
<div className='detailed-status__button'><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
<div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
<div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='heart' onClick={this.handleFavouriteClick} /></div>
{shareButton}
<div className='detailed-status__button'><IconButton className='bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>

+ 2
- 2
app/javascript/flavours/glitch/features/status/components/detailed_status.jsx View File

@ -274,7 +274,7 @@ class DetailedStatus extends ImmutablePureComponent {
if (this.context.router) {
favouriteLink = (
<Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/favourites`} className='detailed-status__link'>
<Icon id='star' />
<Icon id='heart' />
<span className='detailed-status__favorites'>
<AnimatedNumber value={status.get('favourites_count')} />
</span>
@ -283,7 +283,7 @@ class DetailedStatus extends ImmutablePureComponent {
} else {
favouriteLink = (
<a href={`/interact/${status.get('id')}?type=favourite`} className='detailed-status__link' onClick={this.handleModalLink}>
<Icon id='star' />
<Icon id='heart' />
<span className='detailed-status__favorites'>
<AnimatedNumber value={status.get('favourites_count')} />
</span>

+ 1
- 1
app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx View File

@ -90,7 +90,7 @@ class FavouriteModal extends ImmutablePureComponent {
</div>
<div className='boost-modal__action-bar'>
<div><FormattedMessage id='favourite_modal.combo' defaultMessage='You can press {combo} to skip this next time' values={{ combo: <span>Shift + <Icon id='star' /></span> }} /></div>
<div><FormattedMessage id='favourite_modal.combo' defaultMessage='You can press {combo} to skip this next time' values={{ combo: <span>Shift + <Icon id='heart' /></span> }} /></div>
<Button text={intl.formatMessage(messages.favourite)} onClick={this.handleFavourite} ref={this.setRef} />
</div>
</div>

+ 1
- 1
app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx View File

@ -78,7 +78,7 @@ class NavigationPanel extends React.Component {
<React.Fragment>
<ColumnLink transparent to='/conversations' icon='at' text={intl.formatMessage(messages.direct)} />
<ColumnLink transparent to='/bookmarks' icon='bookmark' text={intl.formatMessage(messages.bookmarks)} />
<ColumnLink transparent to='/favourites' icon='star' text={intl.formatMessage(messages.favourites)} />
<ColumnLink transparent to='/favourites' icon='heart' text={intl.formatMessage(messages.favourites)} />
<ColumnLink transparent to='/lists' icon='list-ul' text={intl.formatMessage(messages.lists)} />
<ListPanel />

+ 1
- 1
app/javascript/mastodon/components/status_action_bar.jsx View File

@ -359,7 +359,7 @@ class StatusActionBar extends ImmutablePureComponent {
<div className='status__action-bar'>
<IconButton className='status__action-bar__button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
<IconButton className={classNames('status__action-bar__button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={withCounters ? status.get('reblogs_count') : undefined} />
<IconButton className='status__action-bar__button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={withCounters ? status.get('favourites_count') : undefined} />
<IconButton className='status__action-bar__button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='heart' onClick={this.handleFavouriteClick} counter={withCounters ? status.get('favourites_count') : undefined} />
<IconButton className='status__action-bar__button bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} />
{shareButton}

+ 1
- 1
app/javascript/mastodon/features/favourited_statuses/index.jsx View File

@ -74,7 +74,7 @@ class Favourites extends ImmutablePureComponent {
return (
<Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.heading)}>
<ColumnHeader
icon='star'
icon='heart'
title={intl.formatMessage(messages.heading)}
onPin={this.handlePin}
onMove={this.handleMove}

+ 1
- 1
app/javascript/mastodon/features/getting_started/index.jsx View File

@ -112,7 +112,7 @@ class GettingStarted extends ImmutablePureComponent {
<ColumnLink key='home' icon='home' text={intl.formatMessage(messages.home_timeline)} to='/home' />,
<ColumnLink key='direct' icon='at' text={intl.formatMessage(messages.direct)} to='/conversations' />,
<ColumnLink key='bookmark' icon='bookmark' text={intl.formatMessage(messages.bookmarks)} to='/bookmarks' />,
<ColumnLink key='favourites' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
<ColumnLink key='favourites' icon='heart' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
<ColumnLink key='lists' icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />,
);

+ 1
- 1
app/javascript/mastodon/features/interaction_modal/index.jsx View File

@ -106,7 +106,7 @@ class InteractionModal extends React.PureComponent {
actionDescription = <FormattedMessage id='interaction_modal.description.reblog' defaultMessage='With an account on Mastodon, you can boost this post to share it with your own followers.' />;
break;
case 'favourite':
icon = <Icon id='star' />;
icon = <Icon id='heart' />;
title = <FormattedMessage id='interaction_modal.title.favourite' defaultMessage="Favourite {name}'s post" values={{ name }} />;
actionDescription = <FormattedMessage id='interaction_modal.description.favourite' defaultMessage='With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.' />;
break;

+ 1
- 1
app/javascript/mastodon/features/notifications/components/filter_bar.jsx View File

@ -71,7 +71,7 @@ class FilterBar extends React.PureComponent {
onClick={this.onClick('favourite')}
title={intl.formatMessage(tooltips.favourites)}
>
<Icon id='star' fixedWidth />
<Icon id='heart' fixedWidth />
</button>
<button
className={selectedFilter === 'reblog' ? 'active' : ''}

+ 1
- 1
app/javascript/mastodon/features/notifications/components/notification.jsx View File

@ -188,7 +188,7 @@ class Notification extends ImmutablePureComponent {
<div className={classNames('notification notification-favourite focusable', { unread })} tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.favourite, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
<div className='notification__message'>
<div className='notification__favourite-icon-wrapper'>
<Icon id='star' className='star-icon' fixedWidth />
<Icon id='heart' className='star-icon' fixedWidth />
</div>
<span title={notification.get('created_at')}>

+ 1
- 1
app/javascript/mastodon/features/picture_in_picture/components/footer.jsx View File

@ -181,7 +181,7 @@ class Footer extends ImmutablePureComponent {
<div className='picture-in-picture__footer'>
<IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
<IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} counter={status.get('reblogs_count')} />
<IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} />
<IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='heart' onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} />
{withOpenButton && <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.open)} icon='external-link' onClick={this.handleOpenClick} href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} />}
</div>
);

+ 1
- 1
app/javascript/mastodon/features/status/components/action_bar.jsx View File

@ -283,7 +283,7 @@ class ActionBar extends React.PureComponent {
<div className='detailed-status__action-bar'>
<div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
<div className='detailed-status__button' ><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
<div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
<div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='heart' onClick={this.handleFavouriteClick} /></div>
<div className='detailed-status__button'><IconButton className='bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
{shareButton}

+ 2
- 2
app/javascript/mastodon/features/status/components/detailed_status.jsx View File

@ -234,7 +234,7 @@ class DetailedStatus extends ImmutablePureComponent {
if (this.context.router) {
favouriteLink = (
<Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/favourites`} className='detailed-status__link'>
<Icon id='star' />
<Icon id='heart' />
<span className='detailed-status__favorites'>
<AnimatedNumber value={status.get('favourites_count')} />
</span>
@ -243,7 +243,7 @@ class DetailedStatus extends ImmutablePureComponent {
} else {
favouriteLink = (
<a href={`/interact/${status.get('id')}?type=favourite`} className='detailed-status__link' onClick={this.handleModalLink}>
<Icon id='star' />
<Icon id='heart' />
<span className='detailed-status__favorites'>
<AnimatedNumber value={status.get('favourites_count')} />
</span>

+ 1
- 1
app/javascript/mastodon/features/ui/components/navigation_panel.jsx View File

@ -82,7 +82,7 @@ class NavigationPanel extends React.Component {
<React.Fragment>
<ColumnLink transparent to='/conversations' icon='at' text={intl.formatMessage(messages.direct)} />
<ColumnLink transparent to='/bookmarks' icon='bookmark' text={intl.formatMessage(messages.bookmarks)} />
<ColumnLink transparent to='/favourites' icon='star' text={intl.formatMessage(messages.favourites)} />
<ColumnLink transparent to='/favourites' icon='heart' text={intl.formatMessage(messages.favourites)} />
<ColumnLink transparent to='/lists' icon='list-ul' text={intl.formatMessage(messages.lists)} />
<ListPanel />

Loading…
Cancel
Save