[Glitch] Move the account dropdown menubar to the right, make sure it doesn't move

Port a91acf79b53307ada584f449da1369c0216a24d1 to glitch-soc

diff --git a/app/javascript/flavours/glitch/features/account/components/header.js b/app/javascript/flavours/glitch/features/account/components/header.js
index fa36e70b59ff26935d98dc7266300c75498714c4..4acaef26be935d01a91503ed2d4518fe616c074b 100644 (file)
--- 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 be82bdab3d1c0f8a4ccc70a15de0f19f87962feb..1039a746b7b77cddcaf4727559a8dcf3680494f1 100644 (file)
--- 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;
       }
     }