Skip to content

Commit

Permalink
Adjust the font stack, #1909
Browse files Browse the repository at this point in the history
  • Loading branch information
charlag committed May 26, 2020
1 parent 9a38084 commit 96c419d
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/gui/main-styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ export function requiresStatusBarHack() {
}

function getFonts(): string {
const fonts: Array<string> = ['-apple-system', 'BlinkMacSystemFont', 'Helvetica', 'Arial', 'sans-serif']
// see https://bitsofco.de/the-new-system-font-stack/
const fonts: Array<string> = [
'-apple-system', 'system-ui', 'BlinkMacSystemFont', "Segoe UI", 'Roboto', 'Helvetica Neue', 'Helvetica', 'Arial', 'sans-serif'
]
// workaround for incorrect Japanese font see https://github.com/tutao/tutanota/issues/1909
if (env.platformId === 'win32' && lang.code === 'ja') fonts.push('SimHei', "黑体")
fonts.push("Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol")
return fonts.join(', ')
Expand Down

0 comments on commit 96c419d

Please sign in to comment.