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

Merge pull request #968 from ThibG/glitch-soc/merge-upstream 

Merge upstream changes
This commit is contained in:
ThibG 2019-03-27 14:02:32 +01:00 committed by GitHub
parent bdf4f56f9a 48230b57d2
commit 7535c607f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,9 +219,9 @@ class Header extends ImmutablePureComponent {
<div className='spacer' /> <div className='spacer' />
<div className='account__header__tabs__buttons'> <div className='account__header__tabs__buttons'>
<DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' />
{actionBtn} {actionBtn}
<DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' />
</div> </div>
</div> </div>

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

@ -5300,7 +5300,7 @@ noscript {
.avatar { .avatar {
display: block; display: block;
flex: 0 0 auto; flex: 0 0 auto;
width: 90px; width: 94px;
margin-left: -2px; margin-left: -2px;
.account__avatar { .account__avatar {
@ -5319,12 +5319,16 @@ noscript {
display: flex; display: flex;
align-items: center; align-items: center;
padding-top: 55px; padding-top: 55px;
overflow: hidden;
.icon-button { .icon-button {
border: 1px solid lighten($ui-base-color, 12%); border: 1px solid lighten($ui-base-color, 12%);
border-radius: 4px; border-radius: 4px;
box-sizing: content-box; box-sizing: content-box;
padding: 2px; padding: 2px;
}
.button {
margin: 0 8px; margin: 0 8px;
} }
} }