diff options
author | Eugen <eugen@zeonfederated.com> | 2017-02-10 19:15:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-10 19:15:13 +0100 |
commit | 874fffb7dc928904927a84838c40f7383ab30368 (patch) | |
tree | 7cbfbd31ae9a090f9269c7413c4dacf505cc6caf /app/assets/javascripts/components/features/account | |
parent | 2d6f603c2bc3ec34c2e50ebacaccc6676bf1fa55 (diff) | |
parent | 73e388e0d89b1810feb8d19bb2528da7db180121 (diff) |
Merge branch 'master' into patch-3
Diffstat (limited to 'app/assets/javascripts/components/features/account')
-rw-r--r-- | app/assets/javascripts/components/features/account/components/header.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/features/account/components/header.jsx b/app/assets/javascripts/components/features/account/components/header.jsx index b2d943c1c..a4f0ca768 100644 --- a/app/assets/javascripts/components/features/account/components/header.jsx +++ b/app/assets/javascripts/components/features/account/components/header.jsx @@ -35,7 +35,7 @@ const Header = React.createClass({ } if (me !== account.get('id') && account.getIn(['relationship', 'followed_by'])) { - info = <span style={{ position: 'absolute', top: '10px', right: '10px', opacity: '0.7', display: 'inline-block', verticalAlign: 'top', background: 'rgba(0, 0, 0, 0.4)', color: '#fff', textTransform: 'uppercase', fontSize: '11px', fontWeight: '500', padding: '4px', borderRadius: '4px' }}><FormattedMessage id='account.follows_you' defaultMessage='Follows you' /></span> + info = <span className='account--follows-info' style={{ position: 'absolute', top: '10px', right: '10px', opacity: '0.7', display: 'inline-block', verticalAlign: 'top', background: 'rgba(0, 0, 0, 0.4)', textTransform: 'uppercase', fontSize: '11px', fontWeight: '500', padding: '4px', borderRadius: '4px' }}><FormattedMessage id='account.follows_you' defaultMessage='Follows you' /></span> } if (me !== account.get('id')) { |