Merge pull request #3641 from omnivore-app/fix/web-system-default-font

Fix issue where System Default font overrides the browser agent font settings
This commit is contained in:
Jackson Harper
2024-03-07 11:54:27 +08:00
committed by GitHub

View File

@ -348,12 +348,22 @@ export function ArticleContainer(props: ArticleContainerProps): JSX.Element {
return isJustified ? 'justify' : 'start'
}
const appliedFont = (name: string | undefined | null) => {
if (name === 'System Default') {
return 'unset'
}
return name
}
const styles = {
fontSize,
margin: props.margin ?? 360,
maxWidthPercentage: maxWidthPercentageOverride ?? props.maxWidthPercentage,
lineHeight: lineHeightOverride ?? props.lineHeight ?? 150,
fontFamily: fontFamilyOverride ?? props.fontFamily ?? 'inter',
fontFamily:
appliedFont(fontFamilyOverride) ??
appliedFont(props.fontFamily) ??
'inter',
readerFontColor:
highContrastTextOverride != undefined
? textColorValue(highContrastTextOverride)