diff options
author | mayaeh <mayaeh@marimo-net.org> | 2018-09-28 03:36:36 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-09-27 20:36:36 +0200 |
commit | 3f9ec3de82c1a3879a2b092672f51c1caca76f5c (patch) | |
tree | dfedda7e044aeb59c2c7abc2ed659bc513afcae6 /app/javascript | |
parent | a72a939334016c093884d6dca911d2b450872f91 (diff) |
Fix some icon names changed by the Font Awesome 5. (#8796)
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/mastodon/features/getting_started/index.js | 2 | ||||
-rw-r--r-- | app/javascript/mastodon/features/list_timeline/index.js | 2 | ||||
-rw-r--r-- | app/javascript/mastodon/features/video/index.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 4fbe7ed5a..2b70b7501 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -109,7 +109,7 @@ class GettingStarted extends ImmutablePureComponent { if (!multiColumn) { navItems.push( <ColumnSubheading key={i++} text={intl.formatMessage(messages.settings_subheading)} />, - <ColumnLink key={i++} icon='gears' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />, + <ColumnLink key={i++} icon='cogs' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />, ); height += 34 + 48; diff --git a/app/javascript/mastodon/features/list_timeline/index.js b/app/javascript/mastodon/features/list_timeline/index.js index 78ea7624a..cdfb068cf 100644 --- a/app/javascript/mastodon/features/list_timeline/index.js +++ b/app/javascript/mastodon/features/list_timeline/index.js @@ -154,7 +154,7 @@ class ListTimeline extends React.PureComponent { </button> <button className='text-btn column-header__setting-btn' tabIndex='0' onClick={this.handleDeleteClick}> - <i className='fas fa-trash' /> <FormattedMessage id='lists.delete' defaultMessage='Delete list' /> + <i className='fas fa-trash-alt' /> <FormattedMessage id='lists.delete' defaultMessage='Delete list' /> </button> </div> diff --git a/app/javascript/mastodon/features/video/index.js b/app/javascript/mastodon/features/video/index.js index 9ef098605..e1e284b5a 100644 --- a/app/javascript/mastodon/features/video/index.js +++ b/app/javascript/mastodon/features/video/index.js @@ -370,7 +370,7 @@ class Video extends React.PureComponent { <div className='video-player__buttons right'> {(!fullscreen && onOpenVideo) && <button type='button' aria-label={intl.formatMessage(messages.expand)} onClick={this.handleOpenVideo}><i className='fas fa-fw fa-expand' /></button>} {onCloseVideo && <button type='button' aria-label={intl.formatMessage(messages.close)} onClick={this.handleCloseVideo}><i className='fas fa-fw fa-compress' /></button>} - <button type='button' aria-label={intl.formatMessage(fullscreen ? messages.exit_fullscreen : messages.fullscreen)} onClick={this.toggleFullscreen}><i className={classNames('fas fa-fw', { 'fa-arrows-alt': !fullscreen, 'fa-compress': fullscreen })} /></button> + <button type='button' aria-label={intl.formatMessage(fullscreen ? messages.exit_fullscreen : messages.fullscreen)} onClick={this.toggleFullscreen}><i className={classNames('fas fa-fw', { 'fa-expand-arrows-alt': !fullscreen, 'fa-compress': fullscreen })} /></button> </div> </div> </div> |