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

use unset instead of undefined for default font

Browse source
This commit is contained in:
Satindar Dhillon 2022-06-05 11:49:46 -07:00
parent d547946e84
commit 0eadd8516e
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apple/OmnivoreKit/Sources/Views/FontSizeAdjustmentPopoverView.swift
View file

@ -6,7 +6,7 @@ public enum WebFont: String, CaseIterable {
case merriweather = "Merriweather"
case lyon = "Lyon"
case tisa = "Tisa"
case system = "undefined"
case system = "unset"
var displayValue: String {
switch self {

2
apple/OmnivoreKit/Sources/Views/Resources/bundle.js
View file

File diff suppressed because one or more lines are too long

8
packages/web/components/templates/article/ArticleContainer.tsx
View file

@ -115,7 +115,8 @@ export function ArticleContainer(props: ArticleContainerProps): JSX.Element {
}
const updateFontFamily = (event: UpdateFontFamilyEvent) => {
const newFontFamily = event.fontFamily ?? fontFamilyOverride
const newFontFamily =
event.fontFamily ?? fontFamilyOverride ?? props.fontFamily ?? 'inter'
console.log('setting font fam to', event.fontFamily)
setFontFamilyOverride(newFontFamily)
}
@ -187,10 +188,7 @@ export function ArticleContainer(props: ArticleContainerProps): JSX.Element {
fontSize,
margin: marginOverride ?? props.margin ?? 360,
lineHeight: lineHeightOverride ?? props.lineHeight ?? 150,
fontFamily:
fontFamilyOverride ??
props.fontFamily ??
(props.isAppleAppEmbed ? undefined : 'inter'),
fontFamily: fontFamilyOverride ?? props.fontFamily ?? 'inter',
readerFontColor: highContrastFont
? theme.colors.readerFontHighContrast.toString()
: theme.colors.readerFont.toString(),

3
packages/web/components/tokens/stitches.config.ts
View file

@ -195,7 +195,7 @@ const darkThemeSpec = {
// Reader Colors
readerBg: '#303030',
readerFont: '#b9b9b9',
readerFontHighContrast: 'black',
readerFontHighContrast: 'white',
readerFontTransparent: 'rgba(185,185,185,0.65)',
readerHeader: '#b9b9b9',
readerTableHeader: '#FFFFFF',
@ -203,7 +203,6 @@ const darkThemeSpec = {
avatarBg: '#000000',
avatarFont: 'rgba(255, 255, 255, 0.8)',
//utility
textDefault: 'rgba(255, 255, 255, 0.8)',
textSubtle: 'rgba(255, 255, 255, 0.65)',