monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Improve WebUI account action bar 

Mostly a port of 2ccef52a4f to glitch-soc
This commit is contained in:
Thibaut Girka 2018-07-30 13:21:48 +02:00 committed by ThibG
parent 4cf7cfd9e0
commit 88b7ccc2ca
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,17 +125,17 @@ export default class ActionBar extends React.PureComponent {
<div className='account__action-bar-links'> <div className='account__action-bar-links'>
<Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}`}> <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}`}>
<span><FormattedMessage id='account.posts' defaultMessage='Posts' /></span> <FormattedMessage id='account.posts' defaultMessage='Posts' />
<strong><FormattedNumber value={account.get('statuses_count')} /></strong> <strong><FormattedNumber value={account.get('statuses_count')} /></strong>
</Link> </Link>
<Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}/following`}> <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}/following`}>
<span><FormattedMessage id='account.follows' defaultMessage='Follows' /></span> <FormattedMessage id='account.follows' defaultMessage='Follows' />
<strong><FormattedNumber value={account.get('following_count')} /></strong> <strong><FormattedNumber value={account.get('following_count')} /></strong>
</Link> </Link>
<Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}/followers`}> <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}/followers`}>
<span><FormattedMessage id='account.followers' defaultMessage='Followers' /></span> <FormattedMessage id='account.followers' defaultMessage='Followers' />
<strong><FormattedNumber value={account.get('followers_count')} /></strong> <strong><FormattedNumber value={account.get('followers_count')} /></strong>
</Link> </Link>
</div> </div>

6
app/javascript/flavours/glitch/styles/components/accounts.scss
View File

@ -209,7 +209,6 @@
} }
.account__action-bar-dropdown { .account__action-bar-dropdown {
flex: 0 1 calc(50% - 140px);
padding: 10px; padding: 10px;
.dropdown--active { .dropdown--active {
@ -231,14 +230,15 @@
display: flex; display: flex;
flex: 1 1 auto; flex: 1 1 auto;
line-height: 18px; line-height: 18px;
text-align: center;
} }
.account__action-bar__tab { .account__action-bar__tab {
text-decoration: none; text-decoration: none;
overflow: hidden; overflow: hidden;
flex: 0 1 80px; flex: 0 1 100%;
border-left: 1px solid lighten($ui-base-color, 8%); border-left: 1px solid lighten($ui-base-color, 8%);
padding: 10px 5px; padding: 10px 0;
& > span { & > span {
display: block; display: block;