about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-26 23:05:21 +0100
committerThibG <thib@sitedethib.com>2019-03-28 19:56:40 +0100
commit841d2c9f230c4d42658964137256efdcd68af672 (patch)
tree9424f2116058557c75c83f69bf99b3e79b5d61b0 /app
parent37ad0478ef5348b979895de276e6a36a2ed5bb9e (diff)
[Glitch] Move the account dropdown menubar to the right, make sure it doesn't move
Port a91acf79b53307ada584f449da1369c0216a24d1 to glitch-soc
Diffstat (limited to 'app')
-rw-r--r--app/javascript/flavours/glitch/features/account/components/header.js4
-rw-r--r--app/javascript/flavours/glitch/styles/components/accounts.scss6
2 files changed, 7 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/features/account/components/header.js b/app/javascript/flavours/glitch/features/account/components/header.js
index fa36e70b5..4acaef26b 100644
--- a/app/javascript/flavours/glitch/features/account/components/header.js
+++ b/app/javascript/flavours/glitch/features/account/components/header.js
@@ -212,9 +212,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/flavours/glitch/styles/components/accounts.scss b/app/javascript/flavours/glitch/styles/components/accounts.scss
index be82bdab3..1039a746b 100644
--- a/app/javascript/flavours/glitch/styles/components/accounts.scss
+++ b/app/javascript/flavours/glitch/styles/components/accounts.scss
@@ -557,7 +557,7 @@
     .avatar {
       display: block;
       flex: 0 0 auto;
-      width: 90px;
+      width: 94px;
       margin-left: -2px;
 
       .account__avatar {
@@ -576,12 +576,16 @@
       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;
       }
     }