FIX font

AnubisLMS · Sep 1, 2022 · 523ebd3 · 523ebd3
1 parent 4aec342
commit 523ebd3
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 8 deletions.
diff --git a/web/src/assets/fonts/FiraCode-Bold.ttf → web/public/fonts/FiraCode-Bold.ttf b/web/src/assets/fonts/FiraCode-Bold.ttf → web/public/fonts/FiraCode-Bold.ttf
diff --git a/web/src/assets/fonts/FiraCode-Light.ttf → web/public/fonts/FiraCode-Light.ttf b/web/src/assets/fonts/FiraCode-Light.ttf → web/public/fonts/FiraCode-Light.ttf
diff --git a/web/src/assets/fonts/FiraCode-Medium.ttf → web/public/fonts/FiraCode-Medium.ttf b/web/src/assets/fonts/FiraCode-Medium.ttf → web/public/fonts/FiraCode-Medium.ttf
diff --git a/web/src/assets/fonts/FiraCode-Regular.ttf → web/public/fonts/FiraCode-Regular.ttf b/web/src/assets/fonts/FiraCode-Regular.ttf → web/public/fonts/FiraCode-Regular.ttf
diff --git a/web/src/assets/fonts/FiraCode-SemiBold.ttf → web/public/fonts/FiraCode-SemiBold.ttf b/web/src/assets/fonts/FiraCode-SemiBold.ttf → web/public/fonts/FiraCode-SemiBold.ttf
diff --git a/web/src/App.jsx b/web/src/App.jsx
@@ -22,7 +22,6 @@ import {drawerWidth} from './navconfig';
 
 // Dark theme
 import theme from './theme/Theme';
-import './assets/fonts/FiraCode-Regular.ttf';
 
 import AuthWrapper from './components/shared/AuthWrapper';
 import Main from './Main';

diff --git a/web/src/theme/Theme.jsx b/web/src/theme/Theme.jsx
@@ -1,16 +1,14 @@
-import {createTheme, adaptV4Theme} from '@mui/material/styles';
-import FiraCodeRegular from '../assets/fonts/FiraCode-Regular.ttf';
+import {createTheme} from '@mui/material/styles';
 
 
 const fira = {
-  fontFamily: 'FiraCode',
+  fontFamily: 'Fira Code',
   fontStyle: 'regular',
   fontDisplay: 'swap',
   fontWeight: 400,
   src: `
-    local('FiraCode'),
-    local('FiraCode-Regular'),
-    url(${FiraCodeRegular}) format('ttf')
+    local('Fira Code'),
+    url(/fonts/FiraCode-Regular.ttf) format('ttf')
   `,
   unicodeRange:
     'U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, ' +
@@ -94,7 +92,7 @@ theme = {
     },
     MuiCssBaseline: {
       '@global': {
-        '@font-face': [fira],
+        '@font-face': fira,
       },
     },
   },