Added Studo Feixen Sans font

Vincit · Jun 27, 2024 · 4f49596 · 4f49596
1 parent bb457c4
commit 4f49596
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 11 deletions.
diff --git a/frontend/src/components/App.tsx b/frontend/src/components/App.tsx
@@ -1,15 +1,14 @@
 import React from 'react';
 import { Route, Router, Switch } from 'react-router-dom';
 import { history } from '../services/axiosConfigurer';
-import { theme } from '../theme';
 import { SnackbarProvider } from 'notistack';
 import MainView from './MainView/MainView';
 import LoginView from './login/LoginView';
 import { CssBaseline, Divider, styled, ThemeProvider } from '@mui/material';
 import { renderToStaticMarkup } from 'react-dom/server';
-import { MobileBackground, DesktopBackground } from './images/svgImages';
+import { DesktopBackground, MobileBackground } from './images/svgImages';
 import { theme_2024 } from '../theme_2024';
-import ToggleButton from '@mui/material/ToggleButton';
+
 export const GarApp = styled(Divider)(() => ({}));
 
 const App = () => {

diff --git a/frontend/src/fonts/StudioFeixenVincit-Bold.ttf b/frontend/src/fonts/StudioFeixenVincit-Bold.ttf
diff --git a/frontend/src/fonts/StudioFeixenVincit-Bold.woff b/frontend/src/fonts/StudioFeixenVincit-Bold.woff
diff --git a/frontend/src/fonts/StudioFeixenVincit-Bold.woff2 b/frontend/src/fonts/StudioFeixenVincit-Bold.woff2
diff --git a/frontend/src/fonts/StudioFeixenVincit-Display.ttf b/frontend/src/fonts/StudioFeixenVincit-Display.ttf
diff --git a/frontend/src/fonts/StudioFeixenVincit-Display.woff b/frontend/src/fonts/StudioFeixenVincit-Display.woff
diff --git a/frontend/src/fonts/StudioFeixenVincit-Display.woff2 b/frontend/src/fonts/StudioFeixenVincit-Display.woff2
diff --git a/frontend/src/fonts/StudioFeixenVincit-Regular.ttf b/frontend/src/fonts/StudioFeixenVincit-Regular.ttf
diff --git a/frontend/src/fonts/StudioFeixenVincit-Regular.woff b/frontend/src/fonts/StudioFeixenVincit-Regular.woff
diff --git a/frontend/src/fonts/StudioFeixenVincit-Regular.woff2 b/frontend/src/fonts/StudioFeixenVincit-Regular.woff2
diff --git a/frontend/src/theme_2024.ts b/frontend/src/theme_2024.ts
@@ -16,6 +16,7 @@ import { DoNotDisturbOn } from '@mui/icons-material';
 import CheckCircleIcon from '@mui/icons-material/CheckCircle';
 import { RoomCardReservationStatusIndicator } from './components/RoomCard/RoomCard';
 import Person from '@mui/icons-material/Person';
+import FeixenSansWoff2 from './fonts/StudioFeixenVincit-Regular.woff2';
 
 export const COLORS = {
     ACCENT_PINK: '#FFCAFF',
@@ -46,8 +47,10 @@ export const UserIcon = styled(Person)(({ theme }) => ({
 
 export const DEFAULT_STYLES = {
     defaultSpacer: '24px',
-    smallerSpacer: '16px'
+    smallerSpacer: '16px',
+    defaultFont: 'Studio Feixen Sans'
 };
+const { defaultFont } = DEFAULT_STYLES;
 
 export const DoNotDisturb = styled(DoNotDisturbOn)(({ theme }) => ({
     color: COLORS.ACCENT_RED
@@ -139,7 +142,7 @@ export const DEFAULT_THEME_2024: ThemeOptions = {
     typography: {
         h1: {
             color: COLORS.TEXT_PRIMARY,
-            fontFamily: 'Studio Feixen Sans',
+            fontFamily: defaultFont,
             fontSize: '36px',
             fontStyle: 'normal',
             fontWeight: 4,
@@ -148,30 +151,30 @@ export const DEFAULT_THEME_2024: ThemeOptions = {
         },
         h2: {
             color: COLORS.TEXT_PRIMARY,
-            fontFamily: 'Studio Feixen Sans',
+            fontFamily: defaultFont,
             fontStyle: 'normal',
             fontWeight: 4,
             fontSize: '24px',
             lineHeight: 'normal'
         },
         h3: {
             color: COLORS.TEXT_PRIMARY,
-            fontFamily: 'Studio Feixen Sans',
+            fontFamily: defaultFont,
             fontStyle: 'normal',
             fontWeight: 2,
             fontSize: '16px',
             lineHeight: 'normal'
         },
         body1: {
-            fontFamily: 'Studio Feixen Sans',
+            fontFamily: defaultFont,
             fontStyle: 'normal',
             fontWeight: 4,
             fontSize: '12px',
             lineHeight: 'normal'
         },
         subtitle1: {
             color: COLORS.TEXT_PRIMARY,
-            fontFamily: 'Studio Feixen Sans',
+            fontFamily: defaultFont,
             fontStyle: 'normal',
             fontWeight: 'bold',
             fontSize: '12px',
@@ -180,7 +183,7 @@ export const DEFAULT_THEME_2024: ThemeOptions = {
         },
         h4: {
             color: COLORS.TEXT_DIMGREY,
-            fontFamily: 'Studio Feixen Sans',
+            fontFamily: defaultFont,
             fontStyle: 'normal',
             fontWeight: 2,
             fontSize: '16px',
@@ -198,6 +201,15 @@ export const DEFAULT_THEME_2024: ThemeOptions = {
         snackbar: 1
     },
     components: {
+        MuiCssBaseline: {
+            styleOverrides: `
+        @font-face {
+          font-family: 'Studio Feixen Sans';
+          src: local('Studio Feixen Sans'), local('Studio Feixen Sans'), url(${FeixenSansWoff2}) format('woff2');
+          unicodeRange: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF;
+        }
+      `
+        },
         GarApp: {
             styleOverrides: {
                 root: {
@@ -213,7 +225,7 @@ export const DEFAULT_THEME_2024: ThemeOptions = {
         MuiToggleButton: {
             styleOverrides: {
                 root: {
-                    fontFamily: 'Studio Feixen Sans',
+                    fontFamily: defaultFont,
                     textTransform: 'none',
                     whiteSpace: 'nowrap',