From ea10febd257b5b729a50aeb3218389763f5f4b97 Mon Sep 17 00:00:00 2001 From: Trevor Wolf Date: Tue, 11 Jul 2023 20:26:09 +1000 Subject: [PATCH] fix buttons showing inconsistent styles (#25903) --- app/helpers/accounts_helper.rb | 2 +- .../features/account/components/header.jsx | 8 +-- .../directory/components/account_card.jsx | 10 ++-- .../styles/mastodon-light/diff.scss | 8 --- .../styles/mastodon/components.scss | 4 -- app/javascript/styles/mastodon/statuses.scss | 60 ------------------- 6 files changed, 10 insertions(+), 82 deletions(-) diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb index 6301919a9e..c82dc492dc 100644 --- a/app/helpers/accounts_helper.rb +++ b/app/helpers/accounts_helper.rb @@ -22,7 +22,7 @@ module AccountsHelper def account_action_button(account) return if account.memorial? || account.moved? - link_to ActivityPub::TagManager.instance.url_for(account), class: 'button logo-button', target: '_new' do + link_to ActivityPub::TagManager.instance.url_for(account), class: 'button', target: '_new' do safe_join([logo_as_symbol, t('accounts.follow')]) end end diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx index d95184cdbd..ececb86c08 100644 --- a/app/javascript/mastodon/features/account/components/header.jsx +++ b/app/javascript/mastodon/features/account/components/header.jsx @@ -264,14 +264,14 @@ class Header extends ImmutablePureComponent { if (signedIn && !account.get('relationship')) { // Wait until the relationship is loaded actionBtn = ''; } else if (account.getIn(['relationship', 'requested'])) { - actionBtn =