Use standard system fonts

traccar · Jul 24, 2024 · 995ec5b · 995ec5b
1 parent 438019c
commit 995ec5b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,7 +7,6 @@
     "@emotion/cache": "^11.11.0",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
-    "@fontsource/roboto": "^5.0.13",
     "@mapbox/mapbox-gl-draw": "^1.4.3",
     "@mapbox/mapbox-gl-rtl-text": "^0.2.3",
     "@maplibre/maplibre-gl-geocoder": "^1.5.0",

diff --git a/src/common/theme/index.js b/src/common/theme/index.js
@@ -5,6 +5,23 @@ import dimensions from './dimensions';
 import components from './components';
 
 export default (server, darkMode, direction) => useMemo(() => createTheme({
+  typography: {
+    fontFamily: [
+      'system-ui',
+      '-apple-system',
+      'Segoe UI',
+      'Roboto',
+      'Helvetica Neue',
+      'Arial',
+      'Noto Sans',
+      'Liberation Sans',
+      'sans-serif',
+      'Apple Color Emoji',
+      'Segoe UI Emoji',
+      'Segoe UI Symbol',
+      'Noto Color Emoji',
+    ].join(','),
+  },
   palette: palette(server, darkMode),
   direction,
   dimensions,

diff --git a/src/index.jsx b/src/index.jsx
@@ -1,7 +1,3 @@
-import '@fontsource/roboto/300.css';
-import '@fontsource/roboto/400.css';
-import '@fontsource/roboto/500.css';
-import '@fontsource/roboto/700.css';
 import React from 'react';
 import { createRoot } from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';

diff --git a/src/map/draw/MapGeofenceEdit.js b/src/map/draw/MapGeofenceEdit.js
@@ -32,7 +32,6 @@ const draw = new MapboxDraw({
     filter: ['all'],
     layout: {
       'text-field': '{user_name}',
-      'text-font': ['Roboto Regular'],
       'text-size': 12,
     },
     paint: {