matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Merge pull request #3050 from matrix-org/matthew/sbix

Browse Source 
add sbix fallback twemoji font (and bump to emoji 12)
This commit is contained in:
Matthew Hodgson
2019-06-03 10:01:39 +01:00
committed by GitHub
parent 7a4d69f037 f9d40940e8
commit 1515f8de17
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2
View File

Binary file not shown.

BIN
res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2 Normal file
View File

Binary file not shown.

8
src/utils/FontManager.js
View File

@@ -114,7 +114,13 @@ export async function fixupColorFonts() {
// weights for the emoji to appear in bold messages, etc. // weights for the emoji to appear in bold messages, etc.
document.fonts.add(new FontFace("Twemoji", path, { weight: 600 })); document.fonts.add(new FontFace("Twemoji", path, { weight: 600 }));
document.fonts.add(new FontFace("Twemoji", path, { weight: 700 })); document.fonts.add(new FontFace("Twemoji", path, { weight: 700 }));
} else {
// fall back to SBIX, generated via https://github.com/matrix-org/twemoji-colr/tree/matthew/sbix
const path = `url('${require("../../res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2")}')`;
document.fonts.add(new FontFace("Twemoji", path, {}));
document.fonts.add(new FontFace("Twemoji", path, { weight: 600 }));
document.fonts.add(new FontFace("Twemoji", path, { weight: 700 }));
} }
// if not supported, the browser will fall back to one of the native fonts specified. // ...and if SBIX is not supported, the browser will fall back to one of the native fonts specified.
} }