self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-21 09:38:01 +02:00
Code Issues Releases Activity

Desktop: Fixes #10679: Fix incorrect text rendering on MacOS by changing the default font to Avenir Next (#10686)

Browse Source
This commit is contained in:
Henry Heino 2024-07-05 10:58:09 -07:00 committed by GitHub
parent 320d0df60d
commit a3e04103de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app-desktop/app.ts
View File

@ -204,7 +204,7 @@ class Application extends BaseApplication {
public updateEditorFont() { public updateEditorFont() {
const fontFamilies = []; const fontFamilies = [];
if (Setting.value('style.editor.fontFamily')) fontFamilies.push(`"${Setting.value('style.editor.fontFamily')}"`); if (Setting.value('style.editor.fontFamily')) fontFamilies.push(`"${Setting.value('style.editor.fontFamily')}"`);
fontFamilies.push('Avenir, Arial, sans-serif'); fontFamilies.push('\'Avenir Next\', Avenir, Arial, sans-serif');
// The '*' and '!important' parts are necessary to make sure Russian text is displayed properly // The '*' and '!important' parts are necessary to make sure Russian text is displayed properly
// https://github.com/laurent22/joplin/issues/155 // https://github.com/laurent22/joplin/issues/155

2
packages/renderer/noteStyle.ts
View File

@ -58,7 +58,7 @@ export default function(theme: any, options: Options = null) {
theme = theme ? theme : {}; theme = theme ? theme : {};
const fontFamily = '\'Avenir\', \'Arial\', sans-serif'; const fontFamily = '\'Avenir Next\', \'Avenir\', \'Arial\', sans-serif';
const maxWidthTarget = options.contentMaxWidthTarget ? options.contentMaxWidthTarget : '#rendered-md'; const maxWidthTarget = options.contentMaxWidthTarget ? options.contentMaxWidthTarget : '#rendered-md';
const maxWidthCss = options.contentMaxWidth ? ` const maxWidthCss = options.contentMaxWidth ? `