moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Account header <span> fixes

This commit is contained in:
Alex Gleason 2020-06-04 23:12:14 -05:00
parent 082d3f1121
commit f910caed18
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/soapbox/features/account/components/header.js
View File

@ -55,7 +55,7 @@ const mapStateToProps = state => {
me, me,
isStaff: isStaff(state.getIn(['accounts', me])), isStaff: isStaff(state.getIn(['accounts', me])),
autoPlayGif: getSettings(state).get('autoPlayGif'), autoPlayGif: getSettings(state).get('autoPlayGif'),
version: parseVersion(state.getIn(['instance','version'])), version: parseVersion(state.getIn(['instance', 'version'])),
}; };
}; };
@ -140,8 +140,7 @@ class Header extends ImmutablePureComponent {
menu.push({ text: intl.formatMessage(messages.add_or_remove_from_list), action: this.props.onAddToList }); menu.push({ text: intl.formatMessage(messages.add_or_remove_from_list), action: this.props.onAddToList });
menu.push({ text: intl.formatMessage(account.getIn(['relationship', 'endorsed']) ? messages.unendorse : messages.endorse), action: this.props.onEndorseToggle }); menu.push({ text: intl.formatMessage(account.getIn(['relationship', 'endorsed']) ? messages.unendorse : messages.endorse), action: this.props.onEndorseToggle });
menu.push(null); menu.push(null);
} } else if (version.software === 'Pleroma') {
else if (version.software === 'Pleroma') {
menu.push({ text: intl.formatMessage(messages.add_or_remove_from_list), action: this.props.onAddToList }); menu.push({ text: intl.formatMessage(messages.add_or_remove_from_list), action: this.props.onAddToList });
} }
@ -278,18 +277,18 @@ class Header extends ImmutablePureComponent {
<div className='account__header__extra__links'> <div className='account__header__extra__links'>
<NavLink isActive={this.isStatusesPageActive} activeClassName='active' to={`/@${account.get('acct')}`} title={intl.formatNumber(account.get('statuses_count'))}> <NavLink isActive={this.isStatusesPageActive} activeClassName='active' to={`/@${account.get('acct')}`} title={intl.formatNumber(account.get('statuses_count'))}>
{shortNumberFormat(account.get('statuses_count'))} <span>{shortNumberFormat(account.get('statuses_count'))}</span>
<FormattedMessage id='account.posts' defaultMessage='Posts' /> <span><FormattedMessage id='account.posts' defaultMessage='Posts' /></span>
</NavLink> </NavLink>
<NavLink exact activeClassName='active' to={`/@${account.get('acct')}/following`} title={intl.formatNumber(account.get('following_count'))}> <NavLink exact activeClassName='active' to={`/@${account.get('acct')}/following`} title={intl.formatNumber(account.get('following_count'))}>
{shortNumberFormat(account.get('following_count'))} <span>{shortNumberFormat(account.get('following_count'))}</span>
<FormattedMessage id='account.follows' defaultMessage='Follows' /> <span><FormattedMessage id='account.follows' defaultMessage='Follows' /></span>
</NavLink> </NavLink>
<NavLink exact activeClassName='active' to={`/@${account.get('acct')}/followers`} title={intl.formatNumber(account.get('followers_count'))}> <NavLink exact activeClassName='active' to={`/@${account.get('acct')}/followers`} title={intl.formatNumber(account.get('followers_count'))}>
{shortNumberFormat(account.get('followers_count'))} <span>{shortNumberFormat(account.get('followers_count'))}</span>
<FormattedMessage id='account.followers' defaultMessage='Followers' /> <span><FormattedMessage id='account.followers' defaultMessage='Followers' /></span>
</NavLink> </NavLink>
{ {
@ -300,14 +299,14 @@ class Header extends ImmutablePureComponent {
> >
{ /* : TODO : shortNumberFormat(account.get('favourite_count')) */ } { /* : TODO : shortNumberFormat(account.get('favourite_count')) */ }
<span>•</span> <span>•</span>
<FormattedMessage id='navigation_bar.favourites' defaultMessage='Favorites' /> <span><FormattedMessage id='navigation_bar.favourites' defaultMessage='Favorites' /></span>
</NavLink> </NavLink>
<NavLink <NavLink
exact activeClassName='active' to={`/@${account.get('acct')}/pins`} exact activeClassName='active' to={`/@${account.get('acct')}/pins`}
> >
{ /* : TODO : shortNumberFormat(account.get('pinned_count')) */ } { /* : TODO : shortNumberFormat(account.get('pinned_count')) */ }
<span>•</span> <span>•</span>
<FormattedMessage id='navigation_bar.pins' defaultMessage='Pins' /> <span><FormattedMessage id='navigation_bar.pins' defaultMessage='Pins' /></span>
</NavLink> </NavLink>
</div> </div>
} }