diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-09-28 02:11:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-28 02:11:14 +0200 |
commit | 3d7f68c273f03497ff555acac70355ba1815f7a2 (patch) | |
tree | 497eee9463a7d6e4b711d2d810a5e91aa4baa5e3 /app/javascript/mastodon/features/account | |
parent | 4b78546135b141da9998d284bcba3107d98fe951 (diff) |
Revert Font Awesome 5 upgrade (#8810)
* Revert "Fix some icon names changed by the Font Awesome 5. (#8796)" This reverts commit 3f9ec3de82c1a3879a2b092672f51c1caca76f5c. * Revert "Migrate to font-awesome 5.0. (#8799)" This reverts commit 8bae14591bfb4fc9dd9d89d8082ac0123b03edaa. * Revert "Fix some icons names, unavailable in fontawesome5 (free license). (#8792)" This reverts commit b9c727a945fea5afffb3e3a53279164adfc6e88f. * Revert "Update the icon name changed by the Font Awesome 5. (#8776)" This reverts commit 17af4d27da484fc35ecd4b4dce2443d24aa35d23. * Revert "Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)" This reverts commit 4b794e134d427dbc716606324adb9a885a74abec.
Diffstat (limited to 'app/javascript/mastodon/features/account')
-rw-r--r-- | app/javascript/mastodon/features/account/components/header.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js index 4934e7a27..11ae58905 100644 --- a/app/javascript/mastodon/features/account/components/header.js +++ b/app/javascript/mastodon/features/account/components/header.js @@ -3,7 +3,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import PropTypes from 'prop-types'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import IconButton from '../../../components/icon_button'; -import BotIcon from '../../../components/bot_icon'; import Motion from '../../ui/util/optional_motion'; import spring from 'react-motion/lib/spring'; import ImmutablePureComponent from 'react-immutable-pure-component'; @@ -68,7 +67,6 @@ class Avatar extends ImmutablePureComponent { onBlur={this.handleMouseOut} > <span style={{ display: 'none' }}>{account.get('acct')}</span> - <BotIcon account={account} /> </a> )} </Motion> @@ -140,7 +138,7 @@ class Header extends ImmutablePureComponent { } else { actionBtn = ( <div className='account--action-button'> - <IconButton size={26} icon='pencil-alt' title={intl.formatMessage(messages.edit_profile)} onClick={this.openEditProfile} /> + <IconButton size={26} icon='pencil' title={intl.formatMessage(messages.edit_profile)} onClick={this.openEditProfile} /> </div> ); } @@ -150,7 +148,7 @@ class Header extends ImmutablePureComponent { } if (account.get('locked')) { - lockedIcon = <i className='fas fa-lock' />; + lockedIcon = <i className='fa fa-lock' />; } const content = { __html: account.get('note_emojified') }; @@ -177,7 +175,7 @@ class Header extends ImmutablePureComponent { <dt dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }} title={pair.get('name')} /> <dd className={pair.get('verified_at') && 'verified'} title={pair.get('value_plain')}> - {pair.get('verified_at') && <span title={intl.formatMessage(messages.linkVerifiedOn, { date: intl.formatDate(pair.get('verified_at'), dateFormatOptions) })}><i className='fas fa-check verified__mark' /></span>} <span dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }} /> + {pair.get('verified_at') && <span title={intl.formatMessage(messages.linkVerifiedOn, { date: intl.formatDate(pair.get('verified_at'), dateFormatOptions) })}><i className='fa fa-check verified__mark' /></span>} <span dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }} /> </dd> </dl> ))} |