diff --git a/package.json b/package.json index baea3369f..221a3d086 100644 --- a/package.json +++ b/package.json @@ -99,6 +99,7 @@ "redux": "4.1.0", "sanitize-filename": "1.6.3", "ts-mockery": "1.2.0", + "twemoji-colr-font": "0.0.2", "typescript": "4.3.2", "use-resize-observer": "7.0.0", "uuid": "8.3.2", diff --git a/src/components/editor-page/editor-pane/editor-pane.scss b/src/components/editor-page/editor-pane/editor-pane.scss index 35dd04e7e..c00fb1376 100644 --- a/src/components/editor-page/editor-pane/editor-pane.scss +++ b/src/components/editor-page/editor-pane/editor-pane.scss @@ -14,7 +14,7 @@ @import '../../../../node_modules/firacode/distr/fira_code.css'; .CodeMirror { - font-family: "Fira Code", "Twemoji Mozilla", Consolas, monaco, monospace; + font-family: "Fira Code", "Twemoji", Consolas, monaco, monospace; letter-spacing: 0.025em; line-height: 1.25; font-size: 18px; diff --git a/src/components/editor-page/editor-pane/tool-bar/emoji-picker/emoji-picker.tsx b/src/components/editor-page/editor-pane/tool-bar/emoji-picker/emoji-picker.tsx index 3765f1573..6e8f00add 100644 --- a/src/components/editor-page/editor-pane/tool-bar/emoji-picker/emoji-picker.tsx +++ b/src/components/editor-page/editor-pane/tool-bar/emoji-picker/emoji-picker.tsx @@ -36,7 +36,7 @@ export const emojiPickerConfig = { const twemojiStyle = (): HTMLStyleElement => { const style = document.createElement('style') - style.textContent = 'section.picker { --font-family: "Twemoji Mozilla" !important; }' + style.textContent = 'section.picker { --font-family: "Twemoji" !important; }' return style } diff --git a/src/components/markdown-renderer/markdown-renderer.scss b/src/components/markdown-renderer/markdown-renderer.scss index 786e6ee96..786c81a5b 100644 --- a/src/components/markdown-renderer/markdown-renderer.scss +++ b/src/components/markdown-renderer/markdown-renderer.scss @@ -8,7 +8,7 @@ .markdown-body { position: relative; - font-family: 'Source Sans Pro', "Twemoji Mozilla", sans-serif; + font-family: 'Source Sans Pro', "Twemoji", sans-serif; word-break: break-word; .alert > p, .alert > ul { diff --git a/src/components/markdown-renderer/replace-components/flow/flowchart/flowchart.tsx b/src/components/markdown-renderer/replace-components/flow/flowchart/flowchart.tsx index 949f97c73..6b36a02b2 100644 --- a/src/components/markdown-renderer/replace-components/flow/flowchart/flowchart.tsx +++ b/src/components/markdown-renderer/replace-components/flow/flowchart/flowchart.tsx @@ -36,7 +36,7 @@ export const FlowChart: React.FC = ({ code }) => { 'line-color': darkModeActivated ? '#ffffff' : '#000000', 'element-color': darkModeActivated ? '#ffffff' : '#000000', 'font-color': darkModeActivated ? '#ffffff' : '#000000', - 'font-family': 'Source Sans Pro, "Twemoji Mozilla", monospace' + 'font-family': 'Source Sans Pro, "Twemoji", monospace' }) setError(false) } catch (error) { diff --git a/src/style/fonts/twemoji/TwemojiMozilla.ttf b/src/style/fonts/twemoji/TwemojiMozilla.ttf deleted file mode 100644 index b57322026..000000000 Binary files a/src/style/fonts/twemoji/TwemojiMozilla.ttf and /dev/null differ diff --git a/src/style/fonts/twemoji/TwemojiMozilla.ttf.license b/src/style/fonts/twemoji/TwemojiMozilla.ttf.license deleted file mode 100644 index cf8e22486..000000000 --- a/src/style/fonts/twemoji/TwemojiMozilla.ttf.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2019 Twitter, Inc and other contributors - -SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/src/style/fonts/twemoji/twemoji.scss b/src/style/fonts/twemoji/twemoji.scss deleted file mode 100644 index c415253a1..000000000 --- a/src/style/fonts/twemoji/twemoji.scss +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file) - * - * SPDX-License-Identifier: AGPL-3.0-only - */ - -@font-face { - font-family: "Twemoji Mozilla"; - src: url("TwemojiMozilla.ttf") format("truetype"); -} diff --git a/src/style/index.scss b/src/style/index.scss index 1220c63d8..f6e8d7505 100644 --- a/src/style/index.scss +++ b/src/style/index.scss @@ -9,7 +9,7 @@ @import "../../node_modules/bootstrap/scss/bootstrap"; @import '../../node_modules/react-bootstrap-typeahead/css/Typeahead'; @import "../../node_modules/@fontsource/source-sans-pro/index"; -@import "fonts/twemoji/twemoji"; +@import "../../node_modules/twemoji-colr-font/twemoji"; @import '../../node_modules/fork-awesome/css/fork-awesome.min'; .text-black, body.dark .text-black { diff --git a/src/style/variables.scss b/src/style/variables.scss index 16c3c7be7..66316b6b8 100644 --- a/src/style/variables.scss +++ b/src/style/variables.scss @@ -5,4 +5,4 @@ */ -$font-family-base: "Source Sans Pro", Helvetica, Arial, "Twemoji Mozilla", sans-serif; +$font-family-base: "Source Sans Pro", Helvetica, Arial, "Twemoji", sans-serif; diff --git a/yarn.lock b/yarn.lock index 5cb717b38..7e9358598 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14058,6 +14058,11 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= +twemoji-colr-font@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/twemoji-colr-font/-/twemoji-colr-font-0.0.2.tgz#15ab35df2d140e04cf08187efd0e99d43c2ecb02" + integrity sha512-VUt3THR04+z2xhWp3WR88bjpvaJqjmGz5+DNIkQVNzNzzGtTJFaJcjHHtyji0A1ZPY2WWpAXFMjfdWufWzvlcg== + type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"