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

Merge branch 'develop' of https://github.com/vector-im/element-web into t3chguy/fix/25969

Browse source 
# Conflicts:
#	res/themes/light/css/_fonts.pcss
#	yarn.lock
This commit is contained in:
Michael Telatynski 2024-11-27 10:04:32 +00:00
commit 23c28a957c
No known key found for this signature in database
GPG key ID: A2B008A5F49F5D0D
32 changed files with 1127 additions and 425 deletions
Download patch file Download diff file Expand all files Collapse all files

20
res/themes/light/css/_fonts.pcss Normal file
View file

@ -0,0 +1,20 @@
/* the 'src' links are relative to the bundle.css, which is in a subdirectory.
*/
/* Twemoji COLR */
@font-face {
font-family: "Twemoji";
font-weight: 400;
src: url("$(res)/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2") format("woff2");
}
/* For at least Chrome on Windows 10, we have to explictly add extra weights for the emoji to appear in bold messages, etc. */
@font-face {
font-family: "Twemoji";
font-weight: 600;
src: url("$(res)/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2") format("woff2");
}
@font-face {
font-family: "Twemoji";
font-weight: 700;
src: url("$(res)/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2") format("woff2");
}