diff --git a/src/_pages/ReaderPage/chapterContent/renderChapterContent/ChapterContentComponents.tsx b/src/_pages/ReaderPage/chapterContent/renderChapterContent/ChapterContentComponents.tsx index 2c132ff..45b0636 100644 --- a/src/_pages/ReaderPage/chapterContent/renderChapterContent/ChapterContentComponents.tsx +++ b/src/_pages/ReaderPage/chapterContent/renderChapterContent/ChapterContentComponents.tsx @@ -149,14 +149,12 @@ export const VerseLabel = ({ verseNumber }: { verseNumber: ReactNode }) => { export const Quote = ({ children }: { children: ReactNode }) => { const font = useAtomValue(fontAtom) - const fontFamily = font !== 'sans' ? font : 'mono' - return ( @@ -177,7 +175,7 @@ export const FancyAside = ({ children }: { children: ReactNode }) => { data-component="FancyAside" className={css({ color: 'fg.subtle', - fontFamily: font === 'sans' ? 'mono' : undefined, + fontFamily: font, })} > {children} diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 905122e..df082b1 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -33,7 +33,7 @@ export const viewport = (): Viewport => { themeColor: [ { media: '(prefers-color-scheme: light)', - color: isSepiaTheme ? token('colors.sepia.100') : token('colors.white'), + color: isSepiaTheme ? token('colors.sepia.50') : token('colors.white'), }, { media: '(prefers-color-scheme: dark)', diff --git a/src/organisms/BottomToolbar/PreferencesMenu/FontField.tsx b/src/organisms/BottomToolbar/PreferencesMenu/FontField.tsx index deac1ba..6970a52 100644 --- a/src/organisms/BottomToolbar/PreferencesMenu/FontField.tsx +++ b/src/organisms/BottomToolbar/PreferencesMenu/FontField.tsx @@ -21,14 +21,18 @@ export const FontField = () => { + Font + + } + placeholder="Font" onClick={(e) => { e.stopPropagation() setIsPreferencesMenuSuspended(true) setTimeout(() => setShowFontMenu(true), 150) }} - > - Font - + /> ) } diff --git a/src/organisms/BottomToolbar/PreferencesMenu/SelectField.tsx b/src/organisms/BottomToolbar/PreferencesMenu/SelectField.tsx index a93cbe5..3346ef7 100644 --- a/src/organisms/BottomToolbar/PreferencesMenu/SelectField.tsx +++ b/src/organisms/BottomToolbar/PreferencesMenu/SelectField.tsx @@ -1,6 +1,6 @@ -import { type ButtonHTMLAttributes, type DetailedHTMLProps } from 'react' +import { type MouseEventHandler, type ReactNode } from 'react' import { css, cx } from 'styled-system/css' -import { styled } from 'styled-system/jsx' +import { Caption, Flex, styled } from 'styled-system/jsx' import { flex, square } from 'styled-system/patterns' import { button } from 'styled-system/recipes' @@ -18,27 +18,48 @@ const Label = styled('label', { }) const Button = ({ - children, - ...props -}: DetailedHTMLProps< - ButtonHTMLAttributes, - HTMLButtonElement ->) => ( + label, + placeholder, + onClick, +}: { + label: ReactNode + placeholder?: string + onClick?: MouseEventHandler +}) => (