prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
commit efcc9647a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packages/web/components/templates/article/ArticleContainer.tsx
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)