diff --git a/app/javascript/mastodon/components/callout/redesign.module.scss b/app/javascript/mastodon/components/callout/redesign.module.scss index e0dbbb3daf3..a1100584697 100644 --- a/app/javascript/mastodon/components/callout/redesign.module.scss +++ b/app/javascript/mastodon/components/callout/redesign.module.scss @@ -3,6 +3,7 @@ .rootLarge, .rootSmall { align-items: center; + color: var(--color-text-primary); background-color: var(--color-bg-highlight); border-radius: var(--radius-3); box-sizing: border-box; @@ -20,6 +21,15 @@ .textWrapper { flex-grow: 1; + + a { + color: inherit; + + &:hover, + &:focus-visible { + text-decoration: none; + } + } } .icon { diff --git a/app/javascript/mastodon/features/navigation_panel/redesign/index.tsx b/app/javascript/mastodon/features/navigation_panel/redesign/index.tsx index 6cd61227cd2..de5e5da5d02 100644 --- a/app/javascript/mastodon/features/navigation_panel/redesign/index.tsx +++ b/app/javascript/mastodon/features/navigation_panel/redesign/index.tsx @@ -19,9 +19,12 @@ import FediIcon from '@/images/icons/icon_fediverse.svg?react'; import { fetchLists } from '@/mastodon/actions/lists'; import { closeNavigation } from '@/mastodon/actions/navigation'; import { fetchFollowedHashtags } from '@/mastodon/actions/tags_typed'; +import { Callout } from '@/mastodon/components/callout/redesign'; import { FOCUS_TARGET } from '@/mastodon/components/navigation_focus_target'; import { useScrollSensor } from '@/mastodon/hooks/useScrollSensor'; import { useIdentity } from '@/mastodon/identity_context'; +import { disabledAccountId } from '@/mastodon/initial_state'; +import { transientSingleColumn } from '@/mastodon/is_mobile'; import { openNewComposer } from '@/mastodon/reducers/slices/composer'; import { getOrderedLists } from '@/mastodon/selectors/lists'; import { selectUnreadNotificationGroupsCount } from '@/mastodon/selectors/notifications'; @@ -31,7 +34,7 @@ import { NavigationAccountCardAndMenu } from './account_card_and_menu'; import { NavigationFooterLinks } from './footer_links'; import { NavigationHeader } from './header'; import { ListSection } from './list_section'; -import { LoggedOutInfo } from './logged_out_info'; +import { DisabledAccountBanner, LoggedOutInfo } from './logged_out_info'; import { NavigationLink } from './navigation_link'; import classes from './styles.module.scss'; @@ -74,6 +77,13 @@ function useFollowedHashtags() { return { followedHashtags: tags }; } +const isFediverseFeedsLinkActive = ( + match: unknown, + { pathname }: { pathname: string }, +) => { + return !!match || pathname.startsWith('/public'); +}; + const MAX_HASHTAG_COUNT = 5; export const RedesignNavigationPanel: React.FC<{ @@ -121,6 +131,7 @@ export const RedesignNavigationPanel: React.FC<{ {signedIn && ( <> + {transientSingleColumn && }