summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/fonts/Twemoji-15.0.3.ttfbin0 -> 7409592 bytes
-rw-r--r--res/fonts/TwitterColorEmoji.ttfbin7656676 -> 0 bytes
-rw-r--r--res/fonts/conf.d/10-scale-bitmap-fonts.conf5
-rw-r--r--res/fonts/conf.d/55-emoji-prepend.conf2
-rw-r--r--res/res/emojis.db (renamed from res/res/emojis.bin)bin3434074 -> 4886528 bytes
5 files changed, 5 insertions, 2 deletions
diff --git a/res/fonts/Twemoji-15.0.3.ttf b/res/fonts/Twemoji-15.0.3.ttf
new file mode 100644
index 0000000..402a1d0
--- /dev/null
+++ b/res/fonts/Twemoji-15.0.3.ttf
Binary files differ
diff --git a/res/fonts/TwitterColorEmoji.ttf b/res/fonts/TwitterColorEmoji.ttf
deleted file mode 100644
index 3e41671..0000000
--- a/res/fonts/TwitterColorEmoji.ttf
+++ /dev/null
Binary files differ
diff --git a/res/fonts/conf.d/10-scale-bitmap-fonts.conf b/res/fonts/conf.d/10-scale-bitmap-fonts.conf
index b20b52e..b4e9cb4 100644
--- a/res/fonts/conf.d/10-scale-bitmap-fonts.conf
+++ b/res/fonts/conf.d/10-scale-bitmap-fonts.conf
@@ -12,7 +12,10 @@
<bool>false</bool>
</test>
<edit name="pixelsizefixupfactor" mode="assign">
- <double>0.15</double>
+ <divide>
+ <name target="pattern">pixelsize</name>
+ <name target="font" >pixelsize</name>
+ </divide>
</edit>
</match>
<!--
diff --git a/res/fonts/conf.d/55-emoji-prepend.conf b/res/fonts/conf.d/55-emoji-prepend.conf
index b56cebb..049e6c3 100644
--- a/res/fonts/conf.d/55-emoji-prepend.conf
+++ b/res/fonts/conf.d/55-emoji-prepend.conf
@@ -3,7 +3,7 @@
<fontconfig>
<match>
<edit name="family" mode="prepend" binding="weak">
- <string>Twitter Color Emoji</string>
+ <string>Twemoji 128</string>
</edit>
</match>
</fontconfig> \ No newline at end of file
diff --git a/res/res/emojis.bin b/res/res/emojis.db
index 7694b20..4d34d6f 100644
--- a/res/res/emojis.bin
+++ b/res/res/emojis.db
Binary files differ