about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorLynx Kotoura <admin@sanin.link>2018-06-16 19:57:25 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-06-16 12:57:25 +0200
commit9c08a368e7dbbe621690acc642e5300476b7a89f (patch)
treecd351978664714c962076297cc8edf16dc31361c /app/javascript
parenta9ef82febb929be1e6ccd650cbad5d9850448fc4 (diff)
Adjust account__action-bar contents (#7818)
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/features/account/components/action_bar.js8
-rw-r--r--app/javascript/styles/mastodon/components.scss7
2 files changed, 10 insertions, 5 deletions
diff --git a/app/javascript/mastodon/features/account/components/action_bar.js b/app/javascript/mastodon/features/account/components/action_bar.js
index 2d0f72be2..69726a416 100644
--- a/app/javascript/mastodon/features/account/components/action_bar.js
+++ b/app/javascript/mastodon/features/account/components/action_bar.js
@@ -140,10 +140,6 @@ export default class ActionBar extends React.PureComponent {
         {extraInfo}
 
         <div className='account__action-bar'>
-          <div className='account__action-bar-dropdown'>
-            <DropdownMenuContainer items={menu} icon='bars' size={24} direction='right' />
-          </div>
-
           <div className='account__action-bar-links'>
             <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}`}>
               <span><FormattedMessage id='account.posts' defaultMessage='Toots' /></span>
@@ -160,6 +156,10 @@ export default class ActionBar extends React.PureComponent {
               <strong>{shortNumberFormat(account.get('followers_count'))}</strong>
             </Link>
           </div>
+
+          <div className='account__action-bar-dropdown'>
+            <DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' />
+          </div>
         </div>
       </div>
     );
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 9ec25c572..4bcd1dec7 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1211,6 +1211,10 @@ a .account__avatar {
   flex: 0 1 calc(50% - 140px);
   padding: 10px;
 
+  .icon-button {
+    vertical-align: middle;
+  }
+
   .dropdown--active {
     .dropdown__content.dropdown__right {
       left: 6px;
@@ -1230,13 +1234,14 @@ a .account__avatar {
   display: flex;
   flex: 1 1 auto;
   line-height: 18px;
+  text-align: center;
 }
 
 .account__action-bar__tab {
   text-decoration: none;
   overflow: hidden;
   flex: 0 1 80px;
-  border-left: 1px solid lighten($ui-base-color, 8%);
+  border-right: 1px solid lighten($ui-base-color, 8%);
   padding: 10px 5px;
 
   & > span {