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 d26286e4fe..2eba2282e2 100644 --- a/app/javascript/mastodon/features/account_timeline/components/account_header.tsx +++ b/app/javascript/mastodon/features/account_timeline/components/account_header.tsx @@ -912,6 +912,8 @@ export const AccountHeader: React.FC<{
{badges}
)} + {signedIn && } + {!(suspended || hidden) && (
- {signedIn && }
)} diff --git a/app/javascript/mastodon/features/account_timeline/components/familiar_followers.tsx b/app/javascript/mastodon/features/account_timeline/components/familiar_followers.tsx index 1beaceabb4..fd6e1d5dfd 100644 --- a/app/javascript/mastodon/features/account_timeline/components/familiar_followers.tsx +++ b/app/javascript/mastodon/features/account_timeline/components/familiar_followers.tsx @@ -12,12 +12,16 @@ import { getAccountFamiliarFollowers } from '@/mastodon/selectors/accounts'; import { useAppDispatch, useAppSelector } from '@/mastodon/store'; const AccountLink: React.FC<{ account?: Account }> = ({ account }) => { - // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing - const name = account?.display_name || `@${account?.acct}`; + if (!account) { + return null; + } + return ( - - {name} - + ); }; @@ -50,7 +54,7 @@ const FamiliarFollowersReadout: React.FC<{ familiarFollowers: Account[] }> = ({ return ( ); @@ -80,7 +84,7 @@ export const FamiliarFollowers: React.FC<{ accountId: string }> = ({ return (
- {familiarFollowers.map((account) => ( + {familiarFollowers.slice(0, 3).map((account) => ( ))} diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 2d49346ac7..ee494c7e45 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -28,7 +28,7 @@ "account.edit_profile": "Edit profile", "account.enable_notifications": "Notify me when @{name} posts", "account.endorse": "Feature on profile", - "account.familiar_followers_many": "Followed by {name1}, {name2}, and {othersCount, plural, one {# other} other {# others}}", + "account.familiar_followers_many": "Followed by {name1}, {name2}, and {othersCount, plural, one {one other you know} other {# others you know}}", "account.familiar_followers_one": "Followed by {name1}", "account.familiar_followers_two": "Followed by {name1} and {name2}", "account.featured": "Featured", diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index f3271b2d3b..3245105c94 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -2091,6 +2091,7 @@ body > [data-popper-placement] { display: block; position: relative; border-radius: var(--avatar-border-radius); + background: var(--surface-background-color); img { width: 100%; @@ -8151,16 +8152,13 @@ noscript { display: flex; align-items: center; gap: 10px; - margin-block-end: 16px; + margin-block: 16px; color: $darker-text-color; a:any-link { - color: inherit; - text-decoration: underline; - } - - a:hover { + font-weight: 500; text-decoration: none; + color: $primary-text-color; } } }