Mastodon/Whalebird-desktop-client-mac-linux-windows
1
0
Fork 0
mirror of https://github.com/h3poteto/whalebird-desktop synced 2025-02-10 00:30:39 +01:00
Code Issues Releases Wiki Activity

Merge pull request #967 from h3poteto/emoji

Browse Source 
Add default fonts for emoji in Linux
This commit is contained in:
AkiraFukushima 2019-07-19 00:52:58 +09:00 committed by GitHub
commit 4de4eaf846
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/App.vue
View File

@ -80,7 +80,7 @@ body,
} }
--specified-fonts: 'Noto Sans', 'Noto Sans CJK JP', 'Takaoゴシック', 'ヒラギノ角ゴ ProN W3', '-apple-system', 'BlinkMacSystemFont', --specified-fonts: 'Noto Sans', 'Noto Sans CJK JP', 'Takaoゴシック', 'ヒラギノ角ゴ ProN W3', '-apple-system', 'BlinkMacSystemFont',
'Segoe UI', 'Roboto', 'Helvetica Neue', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; 'Segoe UI', 'Roboto', 'Helvetica Neue', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji', 'Noto Emoji';
font-family: var(--specified-fonts); font-family: var(--specified-fonts);

2
src/renderer/store/Preferences/Appearance.ts
View File

@ -37,7 +37,7 @@ const mutations: MutationTree<AppearanceState> = {
state.appearance = conf state.appearance = conf
}, },
[MUTATION_TYPES.UPDATE_FONTS]: (state, fonts: Array<string>) => { [MUTATION_TYPES.UPDATE_FONTS]: (state, fonts: Array<string>) => {
state.fonts = fonts state.fonts = Array.from(new Set(fonts))
} }
} }

4
src/renderer/utils/fonts/index.js
View File

@ -10,5 +10,7 @@ export default [
'Helvetica Neue', 'Helvetica Neue',
'Apple Color Emoji', 'Apple Color Emoji',
'Segoe UI Emoji', 'Segoe UI Emoji',
'Segoe UI Symbol' 'Segoe UI Symbol',
'Noto Color Emoji',
'Noto Emoji'
] ]