diff --git a/packages/web/components/templates/PrimaryDropdown.tsx b/packages/web/components/templates/PrimaryDropdown.tsx index e7f2d727a..f5698a5f5 100644 --- a/packages/web/components/templates/PrimaryDropdown.tsx +++ b/packages/web/components/templates/PrimaryDropdown.tsx @@ -16,10 +16,12 @@ import { StyledText } from '../elements/StyledText' import { styled, theme, ThemeId } from '../tokens/stitches.config' import { LayoutType } from './homeFeed/HomeFeedContainer' import { useCurrentTheme } from '../../lib/hooks/useCurrentTheme' +import { ThemeSelector } from './article/ReaderSettingsControl' type PrimaryDropdownProps = { children?: ReactNode showThemeSection: boolean + showFullThemeSection: boolean layout?: LayoutType updateLayout?: (layout: LayoutType) => void @@ -192,7 +194,8 @@ export function PrimaryDropdown(props: PrimaryDropdownProps): JSX.Element { - {props.showThemeSection && } + {props.showThemeSection && } + {props.showFullThemeSection && } headerDropdownActionHandler('navigate-to-install')} title="Install" @@ -261,7 +264,21 @@ export const StyledToggleButton = styled('button', { }, }) -function ThemeSection(props: PrimaryDropdownProps): JSX.Element { +const ThemeSection = (props: PrimaryDropdownProps): JSX.Element => { + const { currentTheme, setCurrentTheme, currentThemeIsDark } = + useCurrentTheme() + + return ( + <> + + + + + + ) +} + +function LegacyMenuThemeSection(props: PrimaryDropdownProps): JSX.Element { const { currentTheme, setCurrentTheme, currentThemeIsDark } = useCurrentTheme() diff --git a/packages/web/components/templates/article/ReaderSettingsControl.tsx b/packages/web/components/templates/article/ReaderSettingsControl.tsx index fd220d1d7..279605c87 100644 --- a/packages/web/components/templates/article/ReaderSettingsControl.tsx +++ b/packages/web/components/templates/article/ReaderSettingsControl.tsx @@ -278,7 +278,9 @@ function BasicSettings(props: SettingsProps): JSX.Element { - + + + @@ -597,14 +599,14 @@ function LayoutControls(props: LayoutControlsProps): JSX.Element { ) } -function ThemeSelector(): JSX.Element { +export function ThemeSelector(): JSX.Element { useDarkModeListener() const { currentTheme, setCurrentTheme, resetSystemTheme } = useCurrentTheme() return ( void } @@ -28,7 +29,10 @@ export const NavMenuFooter = (props: NavMenuFooterProps): JSX.Element => { }, }} > - + - + {/* This spacer pushes library content to the right of diff --git a/packages/web/pages/justread/index.tsx b/packages/web/pages/justread/index.tsx index 409408f4f..f98cd6c19 100644 --- a/packages/web/pages/justread/index.tsx +++ b/packages/web/pages/justread/index.tsx @@ -30,7 +30,7 @@ import { SpanBox, VStack, } from './../../components/elements/LayoutPrimitives' -import { Hamburger, List, ThumbsDown, ThumbsUp } from 'phosphor-react' +import { List, ThumbsDown, ThumbsUp } from 'phosphor-react' import { showErrorToast, showSuccessToast } from '../../lib/toastHelpers' import { Toaster } from 'react-hot-toast' import { DEFAULT_HEADER_HEIGHT } from '../../components/templates/homeFeed/HeaderSpacer' @@ -47,8 +47,7 @@ export default function Home(): JSX.Element { alignment="center" css={{ width: '100%', - // bg: '$readerBg', - bg: '#2A2A2A', + bg: '$readerBg', pt: '45px', minHeight: '100vh', }} @@ -338,7 +337,7 @@ const Title = (props: HomeItemViewProps): JSX.Element => { lineHeight: '20px', fontWeight: '600', fontFamily: '$inter', - color: 'white', + color: '$readerText', overflow: 'hidden', textOverflow: 'ellipsis', wordBreak: 'break-word',