diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-26 23:05:21 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-26 23:05:21 +0100 |
| commit | a91acf79b53307ada584f449da1369c0216a24d1 (patch) | |
| tree | c441ecc7aedc9a79b6c5dfa1b51e5cf1f520f812 /app | |
| parent | 6df4a8296996181d56a22535b86830c0ab56086e (diff) | |
Move the account dropdown menubar to the right, make sure it doesn't move (#10390)
* Move the account dropdown menubar to the right, make sure it doesn't move * Fix margin
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/features/account/components/header.js | 4 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js index fd7ad5e07..0a3345f0e 100644 --- a/app/javascript/mastodon/features/account/components/header.js +++ b/app/javascript/mastodon/features/account/components/header.js @@ -219,9 +219,9 @@ class Header extends ImmutablePureComponent { <div className='spacer' /> <div className='account__header__tabs__buttons'> - <DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' /> - {actionBtn} + + <DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' /> </div> </div> diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 3feb62331..f63c66d46 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -5300,7 +5300,7 @@ noscript { .avatar { display: block; flex: 0 0 auto; - width: 90px; + width: 94px; margin-left: -2px; .account__avatar { @@ -5319,12 +5319,16 @@ noscript { display: flex; align-items: center; padding-top: 55px; + overflow: hidden; .icon-button { border: 1px solid lighten($ui-base-color, 12%); border-radius: 4px; box-sizing: content-box; padding: 2px; + } + + .button { margin: 0 8px; } } |