From 9c08a368e7dbbe621690acc642e5300476b7a89f Mon Sep 17 00:00:00 2001 From: Lynx Kotoura Date: Sat, 16 Jun 2018 19:57:25 +0900 Subject: [PATCH] Adjust account__action-bar contents (#7818) --- .../mastodon/features/account/components/action_bar.js | 8 ++++---- app/javascript/styles/mastodon/components.scss | 7 ++++++- 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 2d0f72be24..69726a4167 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}
-
- -
-
@@ -160,6 +156,10 @@ export default class ActionBar extends React.PureComponent { {shortNumberFormat(account.get('followers_count'))}
+ +
+ +
); diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 9ec25c5723..4bcd1dec7b 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 {