diff --git a/package-lock.json b/package-lock.json index 7e42d47f..45a8f834 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,6 @@ "version": "2.1.2", "license": "MIT", "dependencies": { - "@fontsource/noto-sans": "^4.5.11", - "@fontsource/public-sans": "^4.5.10", "@khanacademy/simple-markdown": "^0.8.3", "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz", "@tippyjs/react": "^4.2.6", @@ -1831,16 +1829,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@fontsource/noto-sans": { - "version": "4.5.11", - "resolved": "https://registry.npmjs.org/@fontsource/noto-sans/-/noto-sans-4.5.11.tgz", - "integrity": "sha512-lBX7FCjIjSrQ+iMuXUuO+mbjbnUsJyZANg/04PgkeeAYe+cwnX81ibbgrAk1F56M6/btIrWQoDjxsK6Sz8KoVQ==" - }, - "node_modules/@fontsource/public-sans": { - "version": "4.5.10", - "resolved": "https://registry.npmjs.org/@fontsource/public-sans/-/public-sans-4.5.10.tgz", - "integrity": "sha512-WHqsfQXyjrIy9cQVnsVvnNRIvqB5K9+4OieYSZGRkOhAe7XSR6ghiwjkXVwF6Sc6iGE0YSBpktPymYt2USbHYw==" - }, "node_modules/@humanwhocodes/config-array": { "version": "0.10.4", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz", @@ -14826,16 +14814,6 @@ } } }, - "@fontsource/noto-sans": { - "version": "4.5.11", - "resolved": "https://registry.npmjs.org/@fontsource/noto-sans/-/noto-sans-4.5.11.tgz", - "integrity": "sha512-lBX7FCjIjSrQ+iMuXUuO+mbjbnUsJyZANg/04PgkeeAYe+cwnX81ibbgrAk1F56M6/btIrWQoDjxsK6Sz8KoVQ==" - }, - "@fontsource/public-sans": { - "version": "4.5.10", - "resolved": "https://registry.npmjs.org/@fontsource/public-sans/-/public-sans-4.5.10.tgz", - "integrity": "sha512-WHqsfQXyjrIy9cQVnsVvnNRIvqB5K9+4OieYSZGRkOhAe7XSR6ghiwjkXVwF6Sc6iGE0YSBpktPymYt2USbHYw==" - }, "@humanwhocodes/config-array": { "version": "0.10.4", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz", diff --git a/package.json b/package.json index 00072377..08235109 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,6 @@ "author": "Ajay Bura", "license": "MIT", "dependencies": { - "@fontsource/noto-sans": "^4.5.11", - "@fontsource/public-sans": "^4.5.10", "@khanacademy/simple-markdown": "^0.8.3", "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz", "@tippyjs/react": "^4.2.6", diff --git a/public/font/supreme/README.md b/public/font/supreme/README.md new file mode 100644 index 00000000..b8afbb2f --- /dev/null +++ b/public/font/supreme/README.md @@ -0,0 +1,41 @@ +# Installing Webfonts +Follow these simple Steps. + +## 1. +Put `supreme/` Folder into a Folder called `fonts/`. + +## 2. +Put `supreme.css` into your `css/` Folder. + +## 3. (Optional) +You may adapt the `url('path')` in `supreme.css` depends on your Website Filesystem. + +## 4. +Import `supreme.css` at the top of you main Stylesheet. + +``` +@import url('supreme.css'); +``` + +## 5. + + +``` +font-family: 'Supreme-Variable'; +font-family: 'Supreme-VariableItalic'; +font-family: 'Supreme-Thin'; +font-family: 'Supreme-ThinItalic'; +font-family: 'Supreme-Extralight'; +font-family: 'Supreme-ExtralightItalic'; +font-family: 'Supreme-Light'; +font-family: 'Supreme-LightItalic'; +font-family: 'Supreme-Regular'; +font-family: 'Supreme-Italic'; +font-family: 'Supreme-Medium'; +font-family: 'Supreme-MediumItalic'; +font-family: 'Supreme-Bold'; +font-family: 'Supreme-BoldItalic'; +font-family: 'Supreme-Extrabold'; +font-family: 'Supreme-ExtraboldItalic'; +``` + diff --git a/public/font/supreme/css/supreme.css b/public/font/supreme/css/supreme.css new file mode 100644 index 00000000..41d07503 --- /dev/null +++ b/public/font/supreme/css/supreme.css @@ -0,0 +1,175 @@ +@font-face { + font-family: 'Supreme-Variable'; + src: url('../fonts/Supreme-Variable.woff2') format('woff2'), + url('../fonts/Supreme-Variable.woff') format('woff'), + url('../fonts/Supreme-Variable.ttf') format('truetype'); + font-weight: 100 800; + font-display: swap; + font-style: normal; +} + + +@font-face { + font-family: 'Supreme-VariableItalic'; + src: url('../fonts/Supreme-VariableItalic.woff2') format('woff2'), + url('../fonts/Supreme-VariableItalic.woff') format('woff'), + url('../fonts/Supreme-VariableItalic.ttf') format('truetype'); + font-weight: 100 800; + font-display: swap; + font-style: italic; +} + + +@font-face { + font-family: 'Supreme-Thin'; + src: url('../fonts/Supreme-Thin.woff2') format('woff2'), + url('../fonts/Supreme-Thin.woff') format('woff'), + url('../fonts/Supreme-Thin.ttf') format('truetype'); + font-weight: 100; + font-display: swap; + font-style: normal; +} + + +@font-face { + font-family: 'Supreme-ThinItalic'; + src: url('../fonts/Supreme-ThinItalic.woff2') format('woff2'), + url('../fonts/Supreme-ThinItalic.woff') format('woff'), + url('../fonts/Supreme-ThinItalic.ttf') format('truetype'); + font-weight: 100; + font-display: swap; + font-style: italic; +} + + +@font-face { + font-family: 'Supreme-Extralight'; + src: url('../fonts/Supreme-Extralight.woff2') format('woff2'), + url('../fonts/Supreme-Extralight.woff') format('woff'), + url('../fonts/Supreme-Extralight.ttf') format('truetype'); + font-weight: 200; + font-display: swap; + font-style: normal; +} + + +@font-face { + font-family: 'Supreme-ExtralightItalic'; + src: url('../fonts/Supreme-ExtralightItalic.woff2') format('woff2'), + url('../fonts/Supreme-ExtralightItalic.woff') format('woff'), + url('../fonts/Supreme-ExtralightItalic.ttf') format('truetype'); + font-weight: 200; + font-display: swap; + font-style: italic; +} + + +@font-face { + font-family: 'Supreme-Light'; + src: url('../fonts/Supreme-Light.woff2') format('woff2'), + url('../fonts/Supreme-Light.woff') format('woff'), + url('../fonts/Supreme-Light.ttf') format('truetype'); + font-weight: 300; + font-display: swap; + font-style: normal; +} + + +@font-face { + font-family: 'Supreme-LightItalic'; + src: url('../fonts/Supreme-LightItalic.woff2') format('woff2'), + url('../fonts/Supreme-LightItalic.woff') format('woff'), + url('../fonts/Supreme-LightItalic.ttf') format('truetype'); + font-weight: 300; + font-display: swap; + font-style: italic; +} + + +@font-face { + font-family: 'Supreme-Regular'; + src: url('../fonts/Supreme-Regular.woff2') format('woff2'), + url('../fonts/Supreme-Regular.woff') format('woff'), + url('../fonts/Supreme-Regular.ttf') format('truetype'); + font-weight: 400; + font-display: swap; + font-style: normal; +} + + +@font-face { + font-family: 'Supreme-Italic'; + src: url('../fonts/Supreme-Italic.woff2') format('woff2'), + url('../fonts/Supreme-Italic.woff') format('woff'), + url('../fonts/Supreme-Italic.ttf') format('truetype'); + font-weight: 400; + font-display: swap; + font-style: italic; +} + + +@font-face { + font-family: 'Supreme-Medium'; + src: url('../fonts/Supreme-Medium.woff2') format('woff2'), + url('../fonts/Supreme-Medium.woff') format('woff'), + url('../fonts/Supreme-Medium.ttf') format('truetype'); + font-weight: 500; + font-display: swap; + font-style: normal; +} + + +@font-face { + font-family: 'Supreme-MediumItalic'; + src: url('../fonts/Supreme-MediumItalic.woff2') format('woff2'), + url('../fonts/Supreme-MediumItalic.woff') format('woff'), + url('../fonts/Supreme-MediumItalic.ttf') format('truetype'); + font-weight: 500; + font-display: swap; + font-style: italic; +} + + +@font-face { + font-family: 'Supreme-Bold'; + src: url('../fonts/Supreme-Bold.woff2') format('woff2'), + url('../fonts/Supreme-Bold.woff') format('woff'), + url('../fonts/Supreme-Bold.ttf') format('truetype'); + font-weight: 700; + font-display: swap; + font-style: normal; +} + + +@font-face { + font-family: 'Supreme-BoldItalic'; + src: url('../fonts/Supreme-BoldItalic.woff2') format('woff2'), + url('../fonts/Supreme-BoldItalic.woff') format('woff'), + url('../fonts/Supreme-BoldItalic.ttf') format('truetype'); + font-weight: 700; + font-display: swap; + font-style: italic; +} + + +@font-face { + font-family: 'Supreme-Extrabold'; + src: url('../fonts/Supreme-Extrabold.woff2') format('woff2'), + url('../fonts/Supreme-Extrabold.woff') format('woff'), + url('../fonts/Supreme-Extrabold.ttf') format('truetype'); + font-weight: 800; + font-display: swap; + font-style: normal; +} + + +@font-face { + font-family: 'Supreme-ExtraboldItalic'; + src: url('../fonts/Supreme-ExtraboldItalic.woff2') format('woff2'), + url('../fonts/Supreme-ExtraboldItalic.woff') format('woff'), + url('../fonts/Supreme-ExtraboldItalic.ttf') format('truetype'); + font-weight: 800; + font-display: swap; + font-style: italic; +} + diff --git a/public/font/supreme/fonts/Supreme-Bold.eot b/public/font/supreme/fonts/Supreme-Bold.eot new file mode 100644 index 00000000..6054d30e Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Bold.eot differ diff --git a/public/font/supreme/fonts/Supreme-Bold.ttf b/public/font/supreme/fonts/Supreme-Bold.ttf new file mode 100644 index 00000000..f6208155 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Bold.ttf differ diff --git a/public/font/supreme/fonts/Supreme-Bold.woff b/public/font/supreme/fonts/Supreme-Bold.woff new file mode 100644 index 00000000..91fda845 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Bold.woff differ diff --git a/public/font/supreme/fonts/Supreme-Bold.woff2 b/public/font/supreme/fonts/Supreme-Bold.woff2 new file mode 100644 index 00000000..f9bd77d3 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Bold.woff2 differ diff --git a/public/font/supreme/fonts/Supreme-BoldItalic.eot b/public/font/supreme/fonts/Supreme-BoldItalic.eot new file mode 100644 index 00000000..744e648c Binary files /dev/null and b/public/font/supreme/fonts/Supreme-BoldItalic.eot differ diff --git a/public/font/supreme/fonts/Supreme-BoldItalic.ttf b/public/font/supreme/fonts/Supreme-BoldItalic.ttf new file mode 100644 index 00000000..0b0d0666 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-BoldItalic.ttf differ diff --git a/public/font/supreme/fonts/Supreme-BoldItalic.woff b/public/font/supreme/fonts/Supreme-BoldItalic.woff new file mode 100644 index 00000000..1ec324c5 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-BoldItalic.woff differ diff --git a/public/font/supreme/fonts/Supreme-BoldItalic.woff2 b/public/font/supreme/fonts/Supreme-BoldItalic.woff2 new file mode 100644 index 00000000..c5081b1f Binary files /dev/null and b/public/font/supreme/fonts/Supreme-BoldItalic.woff2 differ diff --git a/public/font/supreme/fonts/Supreme-Extrabold.eot b/public/font/supreme/fonts/Supreme-Extrabold.eot new file mode 100644 index 00000000..b5a9b481 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Extrabold.eot differ diff --git a/public/font/supreme/fonts/Supreme-Extrabold.ttf b/public/font/supreme/fonts/Supreme-Extrabold.ttf new file mode 100644 index 00000000..57ea1e97 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Extrabold.ttf differ diff --git a/public/font/supreme/fonts/Supreme-Extrabold.woff b/public/font/supreme/fonts/Supreme-Extrabold.woff new file mode 100644 index 00000000..2c83fac2 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Extrabold.woff differ diff --git a/public/font/supreme/fonts/Supreme-Extrabold.woff2 b/public/font/supreme/fonts/Supreme-Extrabold.woff2 new file mode 100644 index 00000000..897e1e8c Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Extrabold.woff2 differ diff --git a/public/font/supreme/fonts/Supreme-ExtraboldItalic.eot b/public/font/supreme/fonts/Supreme-ExtraboldItalic.eot new file mode 100644 index 00000000..6a1eee7e Binary files /dev/null and b/public/font/supreme/fonts/Supreme-ExtraboldItalic.eot differ diff --git a/public/font/supreme/fonts/Supreme-ExtraboldItalic.ttf b/public/font/supreme/fonts/Supreme-ExtraboldItalic.ttf new file mode 100644 index 00000000..f8e90c33 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-ExtraboldItalic.ttf differ diff --git a/public/font/supreme/fonts/Supreme-ExtraboldItalic.woff b/public/font/supreme/fonts/Supreme-ExtraboldItalic.woff new file mode 100644 index 00000000..fbf5ba49 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-ExtraboldItalic.woff differ diff --git a/public/font/supreme/fonts/Supreme-ExtraboldItalic.woff2 b/public/font/supreme/fonts/Supreme-ExtraboldItalic.woff2 new file mode 100644 index 00000000..877c0a64 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-ExtraboldItalic.woff2 differ diff --git a/public/font/supreme/fonts/Supreme-Extralight.eot b/public/font/supreme/fonts/Supreme-Extralight.eot new file mode 100644 index 00000000..6c846fd4 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Extralight.eot differ diff --git a/public/font/supreme/fonts/Supreme-Extralight.ttf b/public/font/supreme/fonts/Supreme-Extralight.ttf new file mode 100644 index 00000000..dd41dd6c Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Extralight.ttf differ diff --git a/public/font/supreme/fonts/Supreme-Extralight.woff b/public/font/supreme/fonts/Supreme-Extralight.woff new file mode 100644 index 00000000..b96334a1 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Extralight.woff differ diff --git a/public/font/supreme/fonts/Supreme-Extralight.woff2 b/public/font/supreme/fonts/Supreme-Extralight.woff2 new file mode 100644 index 00000000..3105a632 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Extralight.woff2 differ diff --git a/public/font/supreme/fonts/Supreme-ExtralightItalic.eot b/public/font/supreme/fonts/Supreme-ExtralightItalic.eot new file mode 100644 index 00000000..12bd10e5 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-ExtralightItalic.eot differ diff --git a/public/font/supreme/fonts/Supreme-ExtralightItalic.ttf b/public/font/supreme/fonts/Supreme-ExtralightItalic.ttf new file mode 100644 index 00000000..00f793ac Binary files /dev/null and b/public/font/supreme/fonts/Supreme-ExtralightItalic.ttf differ diff --git a/public/font/supreme/fonts/Supreme-ExtralightItalic.woff b/public/font/supreme/fonts/Supreme-ExtralightItalic.woff new file mode 100644 index 00000000..4f80abf9 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-ExtralightItalic.woff differ diff --git a/public/font/supreme/fonts/Supreme-ExtralightItalic.woff2 b/public/font/supreme/fonts/Supreme-ExtralightItalic.woff2 new file mode 100644 index 00000000..ecb886c8 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-ExtralightItalic.woff2 differ diff --git a/public/font/supreme/fonts/Supreme-Italic.eot b/public/font/supreme/fonts/Supreme-Italic.eot new file mode 100644 index 00000000..59441f2a Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Italic.eot differ diff --git a/public/font/supreme/fonts/Supreme-Italic.ttf b/public/font/supreme/fonts/Supreme-Italic.ttf new file mode 100644 index 00000000..6ec087dd Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Italic.ttf differ diff --git a/public/font/supreme/fonts/Supreme-Italic.woff b/public/font/supreme/fonts/Supreme-Italic.woff new file mode 100644 index 00000000..959e2c07 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Italic.woff differ diff --git a/public/font/supreme/fonts/Supreme-Italic.woff2 b/public/font/supreme/fonts/Supreme-Italic.woff2 new file mode 100644 index 00000000..a33b6d95 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Italic.woff2 differ diff --git a/public/font/supreme/fonts/Supreme-Light.eot b/public/font/supreme/fonts/Supreme-Light.eot new file mode 100644 index 00000000..f5f4a158 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Light.eot differ diff --git a/public/font/supreme/fonts/Supreme-Light.ttf b/public/font/supreme/fonts/Supreme-Light.ttf new file mode 100644 index 00000000..dbf898ff Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Light.ttf differ diff --git a/public/font/supreme/fonts/Supreme-Light.woff b/public/font/supreme/fonts/Supreme-Light.woff new file mode 100644 index 00000000..82d73616 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Light.woff differ diff --git a/public/font/supreme/fonts/Supreme-Light.woff2 b/public/font/supreme/fonts/Supreme-Light.woff2 new file mode 100644 index 00000000..47bd4887 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Light.woff2 differ diff --git a/public/font/supreme/fonts/Supreme-LightItalic.eot b/public/font/supreme/fonts/Supreme-LightItalic.eot new file mode 100644 index 00000000..45230cbc Binary files /dev/null and b/public/font/supreme/fonts/Supreme-LightItalic.eot differ diff --git a/public/font/supreme/fonts/Supreme-LightItalic.ttf b/public/font/supreme/fonts/Supreme-LightItalic.ttf new file mode 100644 index 00000000..973fe90a Binary files /dev/null and b/public/font/supreme/fonts/Supreme-LightItalic.ttf differ diff --git a/public/font/supreme/fonts/Supreme-LightItalic.woff b/public/font/supreme/fonts/Supreme-LightItalic.woff new file mode 100644 index 00000000..076d3ba3 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-LightItalic.woff differ diff --git a/public/font/supreme/fonts/Supreme-LightItalic.woff2 b/public/font/supreme/fonts/Supreme-LightItalic.woff2 new file mode 100644 index 00000000..03cf2b64 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-LightItalic.woff2 differ diff --git a/public/font/supreme/fonts/Supreme-Medium.eot b/public/font/supreme/fonts/Supreme-Medium.eot new file mode 100644 index 00000000..b6df99ac Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Medium.eot differ diff --git a/public/font/supreme/fonts/Supreme-Medium.ttf b/public/font/supreme/fonts/Supreme-Medium.ttf new file mode 100644 index 00000000..5d42e2a8 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Medium.ttf differ diff --git a/public/font/supreme/fonts/Supreme-Medium.woff b/public/font/supreme/fonts/Supreme-Medium.woff new file mode 100644 index 00000000..42a5ebde Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Medium.woff differ diff --git a/public/font/supreme/fonts/Supreme-Medium.woff2 b/public/font/supreme/fonts/Supreme-Medium.woff2 new file mode 100644 index 00000000..751ea8f2 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Medium.woff2 differ diff --git a/public/font/supreme/fonts/Supreme-MediumItalic.eot b/public/font/supreme/fonts/Supreme-MediumItalic.eot new file mode 100644 index 00000000..ab265679 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-MediumItalic.eot differ diff --git a/public/font/supreme/fonts/Supreme-MediumItalic.ttf b/public/font/supreme/fonts/Supreme-MediumItalic.ttf new file mode 100644 index 00000000..241fa570 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-MediumItalic.ttf differ diff --git a/public/font/supreme/fonts/Supreme-MediumItalic.woff b/public/font/supreme/fonts/Supreme-MediumItalic.woff new file mode 100644 index 00000000..89cc6778 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-MediumItalic.woff differ diff --git a/public/font/supreme/fonts/Supreme-MediumItalic.woff2 b/public/font/supreme/fonts/Supreme-MediumItalic.woff2 new file mode 100644 index 00000000..77923210 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-MediumItalic.woff2 differ diff --git a/public/font/supreme/fonts/Supreme-Regular.eot b/public/font/supreme/fonts/Supreme-Regular.eot new file mode 100644 index 00000000..9e537734 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Regular.eot differ diff --git a/public/font/supreme/fonts/Supreme-Regular.ttf b/public/font/supreme/fonts/Supreme-Regular.ttf new file mode 100644 index 00000000..3a1a7bd5 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Regular.ttf differ diff --git a/public/font/supreme/fonts/Supreme-Regular.woff b/public/font/supreme/fonts/Supreme-Regular.woff new file mode 100644 index 00000000..aaf6ded6 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Regular.woff differ diff --git a/public/font/supreme/fonts/Supreme-Regular.woff2 b/public/font/supreme/fonts/Supreme-Regular.woff2 new file mode 100644 index 00000000..50e881bc Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Regular.woff2 differ diff --git a/public/font/supreme/fonts/Supreme-Thin.eot b/public/font/supreme/fonts/Supreme-Thin.eot new file mode 100644 index 00000000..89adcbc3 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Thin.eot differ diff --git a/public/font/supreme/fonts/Supreme-Thin.ttf b/public/font/supreme/fonts/Supreme-Thin.ttf new file mode 100644 index 00000000..c5d97486 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Thin.ttf differ diff --git a/public/font/supreme/fonts/Supreme-Thin.woff b/public/font/supreme/fonts/Supreme-Thin.woff new file mode 100644 index 00000000..f2fbf55a Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Thin.woff differ diff --git a/public/font/supreme/fonts/Supreme-Thin.woff2 b/public/font/supreme/fonts/Supreme-Thin.woff2 new file mode 100644 index 00000000..a924d30d Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Thin.woff2 differ diff --git a/public/font/supreme/fonts/Supreme-ThinItalic.eot b/public/font/supreme/fonts/Supreme-ThinItalic.eot new file mode 100644 index 00000000..043cc4b6 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-ThinItalic.eot differ diff --git a/public/font/supreme/fonts/Supreme-ThinItalic.ttf b/public/font/supreme/fonts/Supreme-ThinItalic.ttf new file mode 100644 index 00000000..2aafa2f8 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-ThinItalic.ttf differ diff --git a/public/font/supreme/fonts/Supreme-ThinItalic.woff b/public/font/supreme/fonts/Supreme-ThinItalic.woff new file mode 100644 index 00000000..d19829f9 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-ThinItalic.woff differ diff --git a/public/font/supreme/fonts/Supreme-ThinItalic.woff2 b/public/font/supreme/fonts/Supreme-ThinItalic.woff2 new file mode 100644 index 00000000..17f97b8f Binary files /dev/null and b/public/font/supreme/fonts/Supreme-ThinItalic.woff2 differ diff --git a/public/font/supreme/fonts/Supreme-Variable.eot b/public/font/supreme/fonts/Supreme-Variable.eot new file mode 100644 index 00000000..3de6199f Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Variable.eot differ diff --git a/public/font/supreme/fonts/Supreme-Variable.ttf b/public/font/supreme/fonts/Supreme-Variable.ttf new file mode 100644 index 00000000..614dc056 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Variable.ttf differ diff --git a/public/font/supreme/fonts/Supreme-Variable.woff b/public/font/supreme/fonts/Supreme-Variable.woff new file mode 100644 index 00000000..4166e784 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Variable.woff differ diff --git a/public/font/supreme/fonts/Supreme-Variable.woff2 b/public/font/supreme/fonts/Supreme-Variable.woff2 new file mode 100644 index 00000000..5fb9f4b2 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-Variable.woff2 differ diff --git a/public/font/supreme/fonts/Supreme-VariableItalic.eot b/public/font/supreme/fonts/Supreme-VariableItalic.eot new file mode 100644 index 00000000..87fef60a Binary files /dev/null and b/public/font/supreme/fonts/Supreme-VariableItalic.eot differ diff --git a/public/font/supreme/fonts/Supreme-VariableItalic.ttf b/public/font/supreme/fonts/Supreme-VariableItalic.ttf new file mode 100644 index 00000000..28be91b9 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-VariableItalic.ttf differ diff --git a/public/font/supreme/fonts/Supreme-VariableItalic.woff b/public/font/supreme/fonts/Supreme-VariableItalic.woff new file mode 100644 index 00000000..b1155eaf Binary files /dev/null and b/public/font/supreme/fonts/Supreme-VariableItalic.woff differ diff --git a/public/font/supreme/fonts/Supreme-VariableItalic.woff2 b/public/font/supreme/fonts/Supreme-VariableItalic.woff2 new file mode 100644 index 00000000..3dbd7281 Binary files /dev/null and b/public/font/supreme/fonts/Supreme-VariableItalic.woff2 differ diff --git a/src/font.js b/src/font.js deleted file mode 100644 index b5ed4b40..00000000 --- a/src/font.js +++ /dev/null @@ -1,6 +0,0 @@ -import '@fontsource/noto-sans/300.css'; -import '@fontsource/noto-sans/400.css'; -import '@fontsource/noto-sans/500.css'; -import '@fontsource/noto-sans/600.css'; -import '@fontsource/noto-sans/700.css'; -import '@fontsource/public-sans/variable.css'; diff --git a/src/index.jsx b/src/index.jsx index 55f8656b..0608b4de 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -1,6 +1,5 @@ import React from 'react'; import ReactDom from 'react-dom'; -import './font'; import './index.scss'; import settings from './client/state/settings'; diff --git a/src/index.scss b/src/index.scss index fe50373a..c33d68b6 100644 --- a/src/index.scss +++ b/src/index.scss @@ -1,4 +1,5 @@ @use './app/partials/screen'; +@import '../public/font/supreme/css/supreme.css'; :root { @@ -131,19 +132,19 @@ /* font styles: font-size, letter-spacing, line-hight */ --fs-h1: 36px; - --ls-h1: 0; + --ls-h1: -1.5px; --lh-h1: 38px; --fs-h2: 24px; - --ls-h2: 0; + --ls-h2: -0.5px; --lh-h2: 30px; --fs-s1: 18px; - --ls-s1: 0; + --ls-s1: -0.2px; --lh-s1: 24px; --fs-b1: 16px; - --ls-b1: 0; + --ls-b1: 0; --lh-b1: 24px; --fs-b2: 14px; @@ -156,8 +157,8 @@ /* font-weight */ --fw-light: 300; - --fw-normal: 400; - --fw-medium: 500; + --fw-normal: 440; + --fw-medium: 600; --fw-bold: 700; @@ -191,9 +192,10 @@ --fluid-push: cubic-bezier(0, 0.8, 0.67, 0.97); --fluid-slide-down: cubic-bezier(0.02, 0.82, 0.4, 0.96); --fluid-slide-up: cubic-bezier(0.13, 0.56, 0.25, 0.99); - - --font-primary: 'Public SansVariable', 'Noto Sans', sans-serif; - --font-secondary: 'Public SansVariable', 'Noto Sans', sans-serif; + + --supreme-font: 'Supreme-Variable', 'Supreme-VariableItalic', 'Supreme-Thin', 'Supreme-ThinItalic', 'Supreme-Extralight', 'Supreme-ExtralightItalic', 'Supreme-Light', 'Supreme-LightItalic', 'Supreme-Regular', 'Supreme-Italic', 'Supreme-Medium', 'Supreme-MediumItalic', 'Supreme-Bold', 'Supreme-BoldItalic', 'Supreme-Extrabold', 'Supreme-ExtraboldItalic'; + --font-primary: var(--supreme-font), Arial, sans-serif; + --font-secondary: var(--font-primary); } @@ -274,17 +276,9 @@ --bs-primary-border: inset 0 0 0 1px var(--bg-primary-border); --bs-primary-outline: 0 0 0 2px var(--bg-primary-border); - - /* font styles: font-size, letter-spacing, line-hight */ - --fs-h1: 36px; - --fs-h2: 24px; - --fs-s1: 18px; - --fs-b1: 15px; - --fs-b2: 14px; - --fs-b3: 12px; /* override normal font weight for dark mode */ - --fw-normal: 330; + --fw-normal: 340; } .dark-theme, @@ -327,24 +321,6 @@ font-family: var(--font-primary); /* override font styles for primary font */ - --fs-h1: 36px; - --lh-h1: 38px; - - --fs-h2: 24px; - --lh-h2: 30px; - - --fs-s1: 18px; - --lh-s1: 24px; - - --fs-b1: 16px; - --lh-b1: 24px; - - --fs-b2: 14px; - --lh-b2: 20px; - - --fs-b3: 12px; - --lh-b3: 16px; - --fw-light: 400; --fw-normal: 500; --fw-medium: 600; @@ -366,7 +342,7 @@ body { background-color: var(--bg-surface-low); /*Why font-variant-ligatures => https://github.com/rsms/inter/issues/222 */ - font-variant-ligatures: no-contextual; + font-variant-ligatures: no-common-ligatures; } #root { width: 100%;