diff --git a/packages/app/assets/fonts.css b/packages/app/assets/fonts.css new file mode 100644 index 000000000..ac5234e8a --- /dev/null +++ b/packages/app/assets/fonts.css @@ -0,0 +1,15 @@ +@font-face { + font-family: 'Martian Mono'; + src: url('./fonts/MartianMono-VariableFont_wdth,wght.woff2') format('woff2'); + font-weight: 100 900; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Source Serif 4'; + src: url('./fonts/SourceSerif4-VariableFont_opsz,wght.woff2') format('woff2'); + font-weight: 200 900; + font-style: normal; + font-display: swap; +} diff --git a/packages/app/assets/fonts/MartianMono-VariableFont_wdth,wght.woff2 b/packages/app/assets/fonts/MartianMono-VariableFont_wdth,wght.woff2 new file mode 100644 index 000000000..b5786e402 Binary files /dev/null and b/packages/app/assets/fonts/MartianMono-VariableFont_wdth,wght.woff2 differ diff --git a/packages/app/assets/fonts/SourceSerif4-VariableFont_opsz,wght.woff2 b/packages/app/assets/fonts/SourceSerif4-VariableFont_opsz,wght.woff2 new file mode 100644 index 000000000..028165b18 Binary files /dev/null and b/packages/app/assets/fonts/SourceSerif4-VariableFont_opsz,wght.woff2 differ diff --git a/packages/app/src/features/NoteEditor/RichEditor/theme/RichEditor.css b/packages/app/src/features/NoteEditor/RichEditor/theme/RichEditor.css index ce6ef263b..8875f9a74 100644 --- a/packages/app/src/features/NoteEditor/RichEditor/theme/RichEditor.css +++ b/packages/app/src/features/NoteEditor/RichEditor/theme/RichEditor.css @@ -146,7 +146,7 @@ background-color: var(--chakra-colors-dim-100); color: var(--chakra-colors-typography); padding: 0.0625rem 0.25rem; - font-family: Menlo, Consolas, Monaco, monospace; + font-family: 'Martian Mono', monospace; font-size: 0.9em; } @@ -186,7 +186,7 @@ background-color: var(--chakra-colors-dim-100); color: var(--chakra-colors-typography); - font-family: Menlo, Consolas, Monaco, monospace; + font-family: 'Martian Mono', monospace; display: block; padding: var(--block-padding); line-height: 1.53; diff --git a/packages/app/src/features/NoteEditor/index.tsx b/packages/app/src/features/NoteEditor/index.tsx index bf547d64c..becb894b7 100644 --- a/packages/app/src/features/NoteEditor/index.tsx +++ b/packages/app/src/features/NoteEditor/index.tsx @@ -43,7 +43,8 @@ import { GLOBAL_COMMANDS } from '@hooks/commands'; import { useCommand } from '@hooks/commands/useCommand'; import { useWorkspaceCommandCallback } from '@hooks/commands/useWorkspaceCommandCallback'; import { useImmutableCallback } from '@hooks/useImmutableCallback'; -import { useAppDispatch } from '@state/redux/hooks'; +import { useAppDispatch, useAppSelector } from '@state/redux/hooks'; +import { selectEditorFontFamily } from '@state/redux/settings/selectors/preferences'; import { useVaultSelector, useWorkspaceData, @@ -292,6 +293,8 @@ export type NoteEditorProps = { */ export const Note2: FC = memo( ({ note, updateNote, updateMeta, isActive }) => { + const fontFamily = useAppSelector(selectEditorFontFamily); + const { t } = useTranslation(LOCALE_NAMESPACE.features); const telemetry = useTelemetryTracker(); @@ -436,6 +439,7 @@ export const Note2: FC = memo( variant="flushed" size="md" fontSize="22px" + fontFamily={fontFamily} value={versionPreview ? versionPreview.title : title} onChange={ versionPreview diff --git a/packages/app/src/state/redux/settings/selectors/preferences.ts b/packages/app/src/state/redux/settings/selectors/preferences.ts index 457c3b08d..4035bebac 100644 --- a/packages/app/src/state/redux/settings/selectors/preferences.ts +++ b/packages/app/src/state/redux/settings/selectors/preferences.ts @@ -11,9 +11,7 @@ export const selectEditorConfig = createAppSelector( export const selectEditorFontFamily = createAppSelector( selectEditorConfig, ({ fontFamily }) => { - const fallback = - // eslint-disable-next-line @cspell/spellchecker - '-apple-system, BlinkMacSystemFont, "SF Pro Text", "SF Pro Display", "Segoe UI", "Segoe UI Variable", "Noto Sans", "Ubuntu", "Cantarell", "Helvetica Neue", Arial, system-ui, sans-serif'; + const fallback = '"Source Serif 4", serif'; const normalizedFontFamily = normalizeFontFamily(fontFamily); diff --git a/packages/app/src/state/redux/settings/settings.ts b/packages/app/src/state/redux/settings/settings.ts index 5e9dbc6fd..f8d42ec0c 100644 --- a/packages/app/src/state/redux/settings/settings.ts +++ b/packages/app/src/state/redux/settings/settings.ts @@ -54,7 +54,7 @@ export const defaultSettings = { editor: { mode: 'richtext', fontFamily: '', - fontSize: 16, + fontSize: 18, lineHeight: 1.6, miniMap: false, lineNumbers: false, diff --git a/packages/app/src/templates/window.html b/packages/app/src/templates/window.html index df848e3ec..1355dfe7e 100644 --- a/packages/app/src/templates/window.html +++ b/packages/app/src/templates/window.html @@ -3,6 +3,12 @@ <%= htmlWebpackPlugin.options.title %> + + + + + +