Skip to content

Commit

Permalink
Move the account dropdown menubar to the right, make sure it doesn't …
Browse files Browse the repository at this point in the history
…move (mastodon#10390)

* Move the account dropdown menubar to the right, make sure it doesn't move

* Fix margin
  • Loading branch information
ClearlyClaire authored and hiyuki2578 committed Oct 2, 2019
1 parent 434d596 commit 0319062
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/javascript/mastodon/features/account/components/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 5 additions & 1 deletion app/javascript/styles/mastodon/components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5300,7 +5300,7 @@ noscript {
.avatar {
display: block;
flex: 0 0 auto;
width: 90px;
width: 94px;
margin-left: -2px;

.account__avatar {
Expand All @@ -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;
}
}
Expand Down

0 comments on commit 0319062

Please sign in to comment.