From 2ccef52a4f5be49e5c3b2256a3c5d4f193a3fe32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lanie=20Chauvel=20=28ariasuni=29?=
<perso@hack-libre.org>
Date: Sat, 28 Jul 2018 20:09:58 +0200
Subject: [PATCH] Improve account bar css (#8087)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Remove superfluous span tags
* Make account bar items (except dropdown) flexible to work well with custom CSS
* Fix CSS lint warning (0px → 0)
---
.../mastodon/features/account/components/action_bar.js | 6 +++---
app/javascript/styles/mastodon/components.scss | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/app/javascript/mastodon/features/account/components/action_bar.js b/app/javascript/mastodon/features/account/components/action_bar.js
index 69726a416..e3f2d0f55 100644
--- a/app/javascript/mastodon/features/account/components/action_bar.js
+++ b/app/javascript/mastodon/features/account/components/action_bar.js
@@ -142,17 +142,17 @@ export default class ActionBar extends React.PureComponent {
<div className='account__action-bar'>
<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>
+ <FormattedMessage id='account.posts' defaultMessage='Toots' />
<strong>{shortNumberFormat(account.get('statuses_count'))}</strong>
</Link>
<Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}/following`}>
- <span><FormattedMessage id='account.follows' defaultMessage='Follows' /></span>
+ <FormattedMessage id='account.follows' defaultMessage='Follows' />
<strong>{shortNumberFormat(account.get('following_count'))}</strong>
</Link>
<Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}/followers`}>
- <span><FormattedMessage id='account.followers' defaultMessage='Followers' /></span>
+ <FormattedMessage id='account.followers' defaultMessage='Followers' />
<strong>{shortNumberFormat(account.get('followers_count'))}</strong>
</Link>
</div>
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 814739dfc..708a6868a 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1236,7 +1236,6 @@ a .account__avatar {
}
.account__action-bar-dropdown {
- flex: 0 1 calc(50% - 140px);
padding: 10px;
.icon-button {
@@ -1268,9 +1267,9 @@ a .account__avatar {
.account__action-bar__tab {
text-decoration: none;
overflow: hidden;
- flex: 0 1 80px;
+ flex: 0 1 100%;
border-right: 1px solid lighten($ui-base-color, 8%);
- padding: 10px 5px;
+ padding: 10px 0;
& > span {
display: block;