From df64716b3407cc423cd261126350ed238206febd Mon Sep 17 00:00:00 2001 From: diondiondion Date: Wed, 8 Apr 2026 14:21:07 +0200 Subject: [PATCH] Rename CSS classes for profile redesign (#38606) --- .../components/account_header.tsx | 32 +++++++------------ .../components/account_name.tsx | 2 +- .../components/account_subscription_form.tsx | 2 +- .../account_timeline/components/fields.tsx | 2 +- .../account_timeline/components/menu.tsx | 6 ++-- .../account_timeline/components/note.tsx | 2 +- ...edesign.module.scss => styles.module.scss} | 0 .../account_timeline/components/tabs.tsx | 2 +- 8 files changed, 19 insertions(+), 29 deletions(-) rename app/javascript/mastodon/features/account_timeline/components/{redesign.module.scss => styles.module.scss} (100%) diff --git a/app/javascript/mastodon/features/account_timeline/components/account_header.tsx b/app/javascript/mastodon/features/account_timeline/components/account_header.tsx index e13d0dee9e..b4b159f8eb 100644 --- a/app/javascript/mastodon/features/account_timeline/components/account_header.tsx +++ b/app/javascript/mastodon/features/account_timeline/components/account_header.tsx @@ -27,9 +27,9 @@ import { FamiliarFollowers } from './familiar_followers'; import { AccountHeaderFields } from './fields'; import { MemorialNote } from './memorial_note'; import { MovedNote } from './moved_note'; -import { AccountNote as AccountNoteRedesign } from './note'; +import { AccountNote } from './note'; import { AccountNumberFields } from './number_fields'; -import redesignClasses from './redesign.module.scss'; +import classes from './styles.module.scss'; import { AccountTabs } from './tabs'; const titleFromAccount = (account: Account) => { @@ -111,12 +111,7 @@ export const AccountHeader: React.FC<{ )} -
+
{!suspendedOrHidden && ( -
+
@@ -180,7 +170,7 @@ export const AccountHeader: React.FC<{
{me && account.id !== me && ( - + )} @@ -203,8 +193,8 @@ export const AccountHeader: React.FC<{ = ({ accountId }) => { const intl = useIntl(); @@ -61,7 +61,7 @@ export const AccountMenu: FC<{ accountId: string }> = ({ accountId }) => { return []; } - return redesignMenuItems({ + return getMenuItems({ account, signedIn: !isMe && signedIn, permissions, @@ -223,7 +223,7 @@ const redesignMessages = defineMessages({ }, }); -function redesignMenuItems({ +function getMenuItems({ account, signedIn, permissions, diff --git a/app/javascript/mastodon/features/account_timeline/components/note.tsx b/app/javascript/mastodon/features/account_timeline/components/note.tsx index b344e81d6b..6bd727791a 100644 --- a/app/javascript/mastodon/features/account_timeline/components/note.tsx +++ b/app/javascript/mastodon/features/account_timeline/components/note.tsx @@ -10,7 +10,7 @@ import { IconButton } from '@/mastodon/components/icon_button'; import { useAppDispatch, useAppSelector } from '@/mastodon/store'; import EditIcon from '@/material-icons/400-24px/edit_square.svg?react'; -import classes from './redesign.module.scss'; +import classes from './styles.module.scss'; const messages = defineMessages({ title: { diff --git a/app/javascript/mastodon/features/account_timeline/components/redesign.module.scss b/app/javascript/mastodon/features/account_timeline/components/styles.module.scss similarity index 100% rename from app/javascript/mastodon/features/account_timeline/components/redesign.module.scss rename to app/javascript/mastodon/features/account_timeline/components/styles.module.scss diff --git a/app/javascript/mastodon/features/account_timeline/components/tabs.tsx b/app/javascript/mastodon/features/account_timeline/components/tabs.tsx index 05dbdb5a80..fc66c39831 100644 --- a/app/javascript/mastodon/features/account_timeline/components/tabs.tsx +++ b/app/javascript/mastodon/features/account_timeline/components/tabs.tsx @@ -10,7 +10,7 @@ import { useAccountId } from '@/mastodon/hooks/useAccountId'; import { areCollectionsEnabled } from '../../collections/utils'; -import classes from './redesign.module.scss'; +import classes from './styles.module.scss'; const isActive: Required['isActive'] = (match, location) => match?.url === location.pathname ||