marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't make stats prominent - hide them in mouseovers

staging
multiple creatures 2019-04-07 01:31:40 -05:00
parent c85e467c0c
commit 8938e343de
4 changed files with 14 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/javascript/flavours/glitch/features/account/components/action_bar.js
View File

@ -49,19 +49,16 @@ export default class ActionBar extends React.PureComponent {
<div className='account__action-bar'>
<div className='account__action-bar-links'>
<NavLink isActive={this.isStatusesPageActive} activeClassName='active' className='account__action-bar__tab' to={`/accounts/${account.get('id')}`}>
<NavLink isActive={this.isStatusesPageActive} activeClassName='active' className='account__action-bar__tab' title={account.get('statuses_count')} to={`/accounts/${account.get('id')}`}>
<FormattedMessage id='account.posts' defaultMessage='Posts' />
<strong><FormattedNumber value={account.get('statuses_count')} /></strong>
</NavLink>
<NavLink exact activeClassName='active' className='account__action-bar__tab' to={`/accounts/${account.get('id')}/following`}>
<NavLink exact activeClassName='active' className='account__action-bar__tab' title={account.get('following_count')} to={`/accounts/${account.get('id')}/following`}>
<FormattedMessage id='account.follows' defaultMessage='Follows' />
<strong><FormattedNumber value={account.get('following_count')} /></strong>
</NavLink>
<NavLink exact activeClassName='active' className='account__action-bar__tab' to={`/accounts/${account.get('id')}/followers`}>
<NavLink exact activeClassName='active' className='account__action-bar__tab' title={account.get('followers_count') < 0 ? '(hidden)' : account.get('followers_count')} to={`/accounts/${account.get('id')}/followers`}>
<FormattedMessage id='account.followers' defaultMessage='Followers' />
<strong>{ account.get('followers_count') < 0 ? '-' : <FormattedNumber value={account.get('followers_count')} /> }</strong>
</NavLink>
</div>
</div>

20
app/javascript/flavours/glitch/features/status/components/detailed_status.js
View File

@ -183,19 +183,13 @@ export default class DetailedStatus extends ImmutablePureComponent {
} else if (this.context.router) {
reblogLink = (
<Link to={`/statuses/${status.get('id')}/reblogs`} className='detailed-status__link'>
<i className={`fa fa-${reblogIcon}`} />
<span className='detailed-status__reblogs'>
<FormattedNumber value={status.get('reblogs_count')} />
</span>
<i className={`fa fa-${reblogIcon}`} title={status.get('reblogs_count')} />
</Link>
);
} else {
reblogLink = (
<a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}>
<i className={`fa fa-${reblogIcon}`} />
<span className='detailed-status__reblogs'>
<FormattedNumber value={status.get('reblogs_count')} />
</span>
<i className={`fa fa-${reblogIcon}`} title={status.get('reblogs_count')} />
</a>
);
}
@ -203,19 +197,13 @@ export default class DetailedStatus extends ImmutablePureComponent {
if (this.context.router) {
favouriteLink = (
<Link to={`/statuses/${status.get('id')}/favourites`} className='detailed-status__link'>
<i className='fa fa-star' />
<span className='detailed-status__favorites'>
<FormattedNumber value={status.get('favourites_count')} />
</span>
<i className='fa fa-star' title={status.get('favourites_count')} />
</Link>
);
} else {
favouriteLink = (
<a href={`/interact/${status.get('id')}?type=favourite`} className='detailed-status__link' onClick={this.handleModalLink}>
<i className='fa fa-star' />
<span className='detailed-status__favorites'>
<FormattedNumber value={status.get('favourites_count')} />
</span>
<i className='fa fa-star' title={status.get('favourites_count')} />
</a>
);
}

6
app/javascript/mastodon/features/account/components/header.js
View File

@ -264,15 +264,15 @@ class Header extends ImmutablePureComponent {
<div className='account__header__extra__links'>
<NavLink isActive={this.isStatusesPageActive} activeClassName='active' to={`/accounts/${account.get('id')}`} title={intl.formatNumber(account.get('statuses_count'))}>
<strong>{shortNumberFormat(account.get('statuses_count'))}</strong> <FormattedMessage id='account.posts' defaultMessage='Toots' />
<FormattedMessage id='account.posts' defaultMessage='Toots' />
</NavLink>
<NavLink exact activeClassName='active' to={`/accounts/${account.get('id')}/following`} title={intl.formatNumber(account.get('following_count'))}>
<strong>{shortNumberFormat(account.get('following_count'))}</strong> <FormattedMessage id='account.follows' defaultMessage='Follows' />
<FormattedMessage id='account.follows' defaultMessage='Follows' />
</NavLink>
<NavLink exact activeClassName='active' to={`/accounts/${account.get('id')}/followers`} title={intl.formatNumber(account.get('followers_count'))}>
<strong>{shortNumberFormat(account.get('followers_count'))}</strong> <FormattedMessage id='account.followers' defaultMessage='Followers' />
<FormattedMessage id='account.followers' defaultMessage='Followers' />
</NavLink>
</div>
</div>

20
app/javascript/mastodon/features/status/components/detailed_status.js
View File

@ -154,19 +154,13 @@ export default class DetailedStatus extends ImmutablePureComponent {
} else if (this.context.router) {
reblogLink = (
<Link to={`/statuses/${status.get('id')}/reblogs`} className='detailed-status__link'>
<Icon id={reblogIcon} />
<span className='detailed-status__reblogs'>
<FormattedNumber value={status.get('reblogs_count')} />
</span>
<Icon id={reblogIcon} title={status.get('reblogs_count')} />
</Link>
);
} else {
reblogLink = (
<a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}>
<Icon id={reblogIcon} />
<span className='detailed-status__reblogs'>
<FormattedNumber value={status.get('reblogs_count')} />
</span>
<Icon id={reblogIcon} title={status.get('reblogs_count')} />
</a>
);
}
@ -174,19 +168,13 @@ export default class DetailedStatus extends ImmutablePureComponent {
if (this.context.router) {
favouriteLink = (
<Link to={`/statuses/${status.get('id')}/favourites`} className='detailed-status__link'>
<Icon id='star' />
<span className='detailed-status__favorites'>
<FormattedNumber value={status.get('favourites_count')} />
</span>
<Icon id='star' title={status.get('favourites_count')} />
</Link>
);
} else {
favouriteLink = (
<a href={`/interact/${status.get('id')}?type=favourite`} className='detailed-status__link' onClick={this.handleModalLink}>
<Icon id='star' />
<span className='detailed-status__favorites'>
<FormattedNumber value={status.get('favourites_count')} />
</span>
<Icon id='star' title={status.get('favourites_count')} />
</a>
);
}