about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/account
diff options
context:
space:
mode:
authorMaciek Baron <thebezet@gmail.com>2018-09-25 04:08:55 +0100
committerEugen Rochko <eugen@zeonfederated.com>2018-09-25 05:08:55 +0200
commit4b794e134d427dbc716606324adb9a885a74abec (patch)
tree70289c00b4a23042dc75a6f498a4d5eb4cbf9944 /app/javascript/mastodon/features/account
parent8864009e8d26d0496bec41d53255fd2cfc3f7cc4 (diff)
Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)
* Migrate to newer version of Font Awesome

* Add bot icon to bot avatars
Diffstat (limited to 'app/javascript/mastodon/features/account')
-rw-r--r--app/javascript/mastodon/features/account/components/header.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index 11ae58905..e498ba5cc 100644
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -3,6 +3,7 @@ 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';
@@ -67,6 +68,7 @@ class Avatar extends ImmutablePureComponent {
             onBlur={this.handleMouseOut}
           >
             <span style={{ display: 'none' }}>{account.get('acct')}</span>
+            <BotIcon account={account} />
           </a>
         )}
       </Motion>