treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix some icon names changed by the Font Awesome 5. (#8796)

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
mayaeh 2018-09-28 03:36:36 +09:00 committed by Eugen Rochko
parent a72a939334
commit 3f9ec3de82
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/getting_started/index.js
View File

@ -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;

2
app/javascript/mastodon/features/list_timeline/index.js
View File

@ -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>

2
app/javascript/mastodon/features/video/index.js
View File

@ -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>