github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-10-18 13:20:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Replace twemoji files with twemoji npm package

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -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",

2
src/components/editor-page/editor-pane/editor-pane.scss
View file

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

2
src/components/editor-page/editor-pane/tool-bar/emoji-picker/emoji-picker.tsx
View file

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

2
src/components/markdown-renderer/markdown-renderer.scss
View file

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

2
src/components/markdown-renderer/replace-components/flow/flowchart/flowchart.tsx
View file

@ -36,7 +36,7 @@ export const FlowChart: React.FC<FlowChartProps> = ({ 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) {

BIN
src/style/fonts/twemoji/TwemojiMozilla.ttf
View file

Binary file not shown.

3
src/style/fonts/twemoji/TwemojiMozilla.ttf.license
View file

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

10
src/style/fonts/twemoji/twemoji.scss
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");
}

2
src/style/index.scss
View file

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

2
src/style/variables.scss
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;

5
yarn.lock
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"
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"