summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-11-30 09:13:54 -0500
committerMatt A. Tobin <email@mattatobin.com>2019-11-30 09:13:54 -0500
commit5102aa579d3d02b9c3e24008342b28c5d6fc455c (patch)
tree45e96dabb2486c4e3a1307174fc080d1999533dd /toolkit
parenta2a84fcb26e04d8d4280b0f9144fb8359e99b49e (diff)
downloadUXP-5102aa579d3d02b9c3e24008342b28c5d6fc455c.tar
UXP-5102aa579d3d02b9c3e24008342b28c5d6fc455c.tar.gz
UXP-5102aa579d3d02b9c3e24008342b28c5d6fc455c.tar.lz
UXP-5102aa579d3d02b9c3e24008342b28c5d6fc455c.tar.xz
UXP-5102aa579d3d02b9c3e24008342b28c5d6fc455c.zip
Issue #1306 - Move bundled fonts to toolkit
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/fonts/README.txt9
-rw-r--r--toolkit/fonts/TwemojiMozilla.ttfbin0 -> 1244336 bytes
-rw-r--r--toolkit/fonts/moz.build8
-rw-r--r--toolkit/moz.build3
4 files changed, 20 insertions, 0 deletions
diff --git a/toolkit/fonts/README.txt b/toolkit/fonts/README.txt
new file mode 100644
index 000000000..bf5cb7e6e
--- /dev/null
+++ b/toolkit/fonts/README.txt
@@ -0,0 +1,9 @@
+Twemoji Mozilla
+================
+
+The upstream repository of Twemoji Mozilla can be found at
+
+ https://github.com/mozilla/twemoji-colr
+
+Please refer commit history for the current version of the font.
+This file purposely omits the version, so there is no need to update it here.
diff --git a/toolkit/fonts/TwemojiMozilla.ttf b/toolkit/fonts/TwemojiMozilla.ttf
new file mode 100644
index 000000000..d79250cb0
--- /dev/null
+++ b/toolkit/fonts/TwemojiMozilla.ttf
Binary files differ
diff --git a/toolkit/fonts/moz.build b/toolkit/fonts/moz.build
new file mode 100644
index 000000000..fb6a9b24c
--- /dev/null
+++ b/toolkit/fonts/moz.build
@@ -0,0 +1,8 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+if CONFIG['OS_ARCH'] in ('WINNT', 'Linux'):
+ FINAL_TARGET_FILES.fonts += ['TwemojiMozilla.ttf']
diff --git a/toolkit/moz.build b/toolkit/moz.build
index 397444828..b02d122cd 100644
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -19,6 +19,9 @@ DIRS += [
'themes',
]
+if CONFIG['MOZ_BUNDLED_FONTS']:
+ DIRS += ['fonts']
+
if CONFIG['MOZ_JETPACK']:
DIRS += ['jetpack']