diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2023-05-30 12:05:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-30 12:05:42 -0700 |
| commit | e6b912f1cac746dbb023705d9eee4a92d04a366d (patch) | |
| tree | 5ed937f56a10f2eb9a8eb391a2eb4ad9110a7ac2 | |
| parent | 97b633f35db34f9e804cc9af72ccfc9eeddfa213 (diff) | |
| parent | 2db79caac3515093b7ffe31e2ce55a3dc64431c3 (diff) | |
| download | trackermap-web-e6b912f1cac746dbb023705d9eee4a92d04a366d.tar.gz trackermap-web-e6b912f1cac746dbb023705d9eee4a92d04a366d.tar.bz2 trackermap-web-e6b912f1cac746dbb023705d9eee4a92d04a366d.zip | |
Merge pull request #1130 from jjreset/master
change roboto font package
| -rw-r--r-- | modern/package-lock.json | 12 | ||||
| -rw-r--r-- | modern/package.json | 2 | ||||
| -rw-r--r-- | modern/src/index.js | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/modern/package-lock.json b/modern/package-lock.json index 8fd507be..b7346504 100644 --- a/modern/package-lock.json +++ b/modern/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.6", + "@fontsource/roboto": "^5.0.1", "@mapbox/mapbox-gl-draw": "^1.4.1", "@maplibre/maplibre-gl-geocoder": "^1.5.0", "@mui/icons-material": "^5.11.16", @@ -34,7 +35,6 @@ "react-window": "^1.8.8", "recharts": "^2.5.0", "redux": "^4.2.1", - "typeface-roboto": "1.1.13", "wellknown": "^0.5.0", "workbox-background-sync": "^6.5.4", "workbox-broadcast-update": "^6.5.4", @@ -2392,6 +2392,11 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/@fontsource/roboto": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-5.0.1.tgz", + "integrity": "sha512-pWF64nF35Tfoh2kWgOuJYEFTLkpn+O3/GIR//u1MGD9b1yR+UBwYKXmcNx9CRyNPjMdWjkdN9GKDHhaWZRYbnw==" + }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", @@ -17514,11 +17519,6 @@ "is-typedarray": "^1.0.0" } }, - "node_modules/typeface-roboto": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/typeface-roboto/-/typeface-roboto-1.1.13.tgz", - "integrity": "sha512-YXvbd3a1QTREoD+FJoEkl0VQNJoEjewR2H11IjVv4bp6ahuIcw0yyw/3udC4vJkHw3T3cUh85FTg8eWef3pSaw==" - }, "node_modules/unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", diff --git a/modern/package.json b/modern/package.json index 66d751eb..ba85defc 100644 --- a/modern/package.json +++ b/modern/package.json @@ -5,6 +5,7 @@ "dependencies": { "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.6", + "@fontsource/roboto": "^4.5.8", "@mapbox/mapbox-gl-draw": "^1.4.1", "@maplibre/maplibre-gl-geocoder": "^1.5.0", "@mui/icons-material": "^5.11.16", @@ -29,7 +30,6 @@ "react-window": "^1.8.8", "recharts": "^2.5.0", "redux": "^4.2.1", - "typeface-roboto": "1.1.13", "wellknown": "^0.5.0", "workbox-background-sync": "^6.5.4", "workbox-broadcast-update": "^6.5.4", diff --git a/modern/src/index.js b/modern/src/index.js index 936fe7c1..50cecce3 100644 --- a/modern/src/index.js +++ b/modern/src/index.js @@ -1,4 +1,6 @@ -import 'typeface-roboto'; +import '@fontsource/roboto/latin-400.css'; +import '@fontsource/roboto/latin-500.css'; +import '@fontsource/roboto/latin-700.css'; import React from 'react'; import { createRoot } from 'react-dom/client'; import { BrowserRouter } from 'react-router-dom'; |