Replace twemoji files with twemoji npm package

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>
This commit is contained in:
Tilman Vatteroth 2021-06-05 23:37:02 +02:00
parent 154cb4c739
commit 8b78154075
11 changed files with 12 additions and 19 deletions

View file

@ -99,6 +99,7 @@
"redux": "4.1.0", "redux": "4.1.0",
"sanitize-filename": "1.6.3", "sanitize-filename": "1.6.3",
"ts-mockery": "1.2.0", "ts-mockery": "1.2.0",
"twemoji-colr-font": "0.0.2",
"typescript": "4.3.2", "typescript": "4.3.2",
"use-resize-observer": "7.0.0", "use-resize-observer": "7.0.0",
"uuid": "8.3.2", "uuid": "8.3.2",

View file

@ -14,7 +14,7 @@
@import '../../../../node_modules/firacode/distr/fira_code.css'; @import '../../../../node_modules/firacode/distr/fira_code.css';
.CodeMirror { .CodeMirror {
font-family: "Fira Code", "Twemoji Mozilla", Consolas, monaco, monospace; font-family: "Fira Code", "Twemoji", Consolas, monaco, monospace;
letter-spacing: 0.025em; letter-spacing: 0.025em;
line-height: 1.25; line-height: 1.25;
font-size: 18px; font-size: 18px;

View file

@ -36,7 +36,7 @@ export const emojiPickerConfig = {
const twemojiStyle = (): HTMLStyleElement => { const twemojiStyle = (): HTMLStyleElement => {
const style = document.createElement('style') const style = document.createElement('style')
style.textContent = 'section.picker { --font-family: "Twemoji Mozilla" !important; }' style.textContent = 'section.picker { --font-family: "Twemoji" !important; }'
return style return style
} }

View file

@ -8,7 +8,7 @@
.markdown-body { .markdown-body {
position: relative; position: relative;
font-family: 'Source Sans Pro', "Twemoji Mozilla", sans-serif; font-family: 'Source Sans Pro', "Twemoji", sans-serif;
word-break: break-word; word-break: break-word;
.alert > p, .alert > ul { .alert > p, .alert > ul {

View file

@ -36,7 +36,7 @@ export const FlowChart: React.FC<FlowChartProps> = ({ code }) => {
'line-color': darkModeActivated ? '#ffffff' : '#000000', 'line-color': darkModeActivated ? '#ffffff' : '#000000',
'element-color': darkModeActivated ? '#ffffff' : '#000000', 'element-color': darkModeActivated ? '#ffffff' : '#000000',
'font-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) setError(false)
} catch (error) { } catch (error) {

View file

@ -1,3 +0,0 @@
SPDX-FileCopyrightText: 2019 Twitter, Inc and other contributors
SPDX-License-Identifier: CC-BY-4.0

View file

@ -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");
}

View file

@ -9,7 +9,7 @@
@import "../../node_modules/bootstrap/scss/bootstrap"; @import "../../node_modules/bootstrap/scss/bootstrap";
@import '../../node_modules/react-bootstrap-typeahead/css/Typeahead'; @import '../../node_modules/react-bootstrap-typeahead/css/Typeahead';
@import "../../node_modules/@fontsource/source-sans-pro/index"; @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'; @import '../../node_modules/fork-awesome/css/fork-awesome.min';
.text-black, body.dark .text-black { .text-black, body.dark .text-black {

View file

@ -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;

View file

@ -14058,6 +14058,11 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= 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: type-check@^0.4.0, type-check@~0.4.0:
version "0.4.0" version "0.4.0"
resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"