treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Adjust account__action-bar contents (#7818)

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Lynx Kotoura 2018-06-16 19:57:25 +09:00 committed by Eugen Rochko
parent a9ef82febb
commit 9c08a368e7
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/mastodon/features/account/components/action_bar.js
View File

@ -140,10 +140,6 @@ export default class ActionBar extends React.PureComponent {
{extraInfo} {extraInfo}
<div className='account__action-bar'> <div className='account__action-bar'>
<div className='account__action-bar-dropdown'>
<DropdownMenuContainer items={menu} icon='bars' size={24} direction='right' />
</div>
<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='Toots' /></span> <span><FormattedMessage id='account.posts' defaultMessage='Toots' /></span>
@ -160,6 +156,10 @@ export default class ActionBar extends React.PureComponent {
<strong>{shortNumberFormat(account.get('followers_count'))}</strong> <strong>{shortNumberFormat(account.get('followers_count'))}</strong>
</Link> </Link>
</div> </div>
<div className='account__action-bar-dropdown'>
<DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' />
</div>
</div> </div>
</div> </div>
); );

7
app/javascript/styles/mastodon/components.scss
View File

@ -1211,6 +1211,10 @@ a .account__avatar {
flex: 0 1 calc(50% - 140px); flex: 0 1 calc(50% - 140px);
padding: 10px; padding: 10px;
.icon-button {
vertical-align: middle;
}
.dropdown--active { .dropdown--active {
.dropdown__content.dropdown__right { .dropdown__content.dropdown__right {
left: 6px; left: 6px;
@ -1230,13 +1234,14 @@ a .account__avatar {
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 80px;
border-left: 1px solid lighten($ui-base-color, 8%); border-right: 1px solid lighten($ui-base-color, 8%);
padding: 10px 5px; padding: 10px 5px;
& > span { & > span {