imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3015 from matrix-org/jryans/windows-emoji

Browse source 
Windows emoji tweaks
This commit is contained in:
J. Ryan Stinnett 2019-05-22 16:38:24 +01:00 • committed by GitHub
commit 1ff196a964
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
res/themes/light/css/_light.scss
View file

@ -5,9 +5,9 @@
Arial empirically gets it right, hence prioritising Arial here. */ Arial empirically gets it right, hence prioritising Arial here. */
/* We fall through to Twemoji for emoji rather than falling through /* We fall through to Twemoji for emoji rather than falling through
to native Emoji fonts (if any) to ensure cross-browser consistency */ to native Emoji fonts (if any) to ensure cross-browser consistency */
$font-family: Nunito, Twemoji, 'Apple Color Emoji', 'Noto Color Emoji', Arial, Helvetica, Sans-Serif; $font-family: Nunito, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', 'Noto Color Emoji', Arial, Helvetica, Sans-Serif;
$monospace-font-family: Inconsolata, Twemoji, 'Apple Color Emoji', 'Noto Color Emoji', Courier, monospace; $monospace-font-family: Inconsolata, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', 'Noto Color Emoji', Courier, monospace;
// unified palette // unified palette
// try to use these colors when possible // try to use these colors when possible

9
src/utils/FontManager.js
View file

@ -77,9 +77,12 @@ export async function fixupColorFonts() {
} }
if (await isColrFontSupported()) { if (await isColrFontSupported()) {
const font = new FontFace("Twemoji", const path = `url('${require("../../res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2")}')`;
`url('${require("../../res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2")}')`, {}); document.fonts.add(new FontFace("Twemoji", path, {}));
document.fonts.add(font); // For at least Chrome on Windows 10, we have to explictly add extra
// 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: 700 }));
} }
// if not supported, the browser will fall back to one of the native fonts specified. // if not supported, the browser will fall back to one of the native fonts specified.
} }