diff options
author | kawax <kawaxbiz@gmail.com> | 2017-05-03 18:43:37 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-03 11:43:37 +0200 |
commit | 383c0b780282e4ca2a9df2086166a576eef0f296 (patch) | |
tree | 76c4b2e6d4f7633a1a4608b8983d6644329805e6 /app/javascript/mastodon/features/notifications/components/notification.js | |
parent | bf8031e984a95827fd50591ea5ae3dbc4c2f004b (diff) |
Show boosted user's avatar (#2518)
* Show boosted user's avatar * add .status__avatar-boost * margin * apply to notifications too. * account__avatar-boost * Add inline prop to Avatar component * Add AvatarOverlay component * rename mixins.scss * move files for latest master * fixed for webpack
Diffstat (limited to 'app/javascript/mastodon/features/notifications/components/notification.js')
-rw-r--r-- | app/javascript/mastodon/features/notifications/components/notification.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js index f54a65747..7b11fea24 100644 --- a/app/javascript/mastodon/features/notifications/components/notification.js +++ b/app/javascript/mastodon/features/notifications/components/notification.js @@ -2,6 +2,7 @@ import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; import StatusContainer from '../../../containers/status_container'; import AccountContainer from '../../../containers/account_container'; +import Avatar from '../../../components/avatar'; import { FormattedMessage } from 'react-intl'; import Permalink from '../../../components/permalink'; import emojify from '../../../emoji'; @@ -37,11 +38,10 @@ class Notification extends ImmutablePureComponent { <div className='notification__favourite-icon-wrapper'> <i className='fa fa-fw fa-star star-icon'/> </div> - <FormattedMessage id='notification.favourite' defaultMessage='{name} favourited your status' values={{ name: link }} /> </div> - <StatusContainer id={notification.get('status')} muted={true} /> + <StatusContainer id={notification.get('status')} account={notification.get('account')} muted={true} /> </div> ); } @@ -53,11 +53,10 @@ class Notification extends ImmutablePureComponent { <div className='notification__favourite-icon-wrapper'> <i className='fa fa-fw fa-retweet' /> </div> - <FormattedMessage id='notification.reblog' defaultMessage='{name} boosted your status' values={{ name: link }} /> </div> - <StatusContainer id={notification.get('status')} muted={true} /> + <StatusContainer id={notification.get('status')} account={notification.get('account')} muted={true} /> </div> ); } |