Merge pull request #92 from heronlancellot/feat/RefactorTypography

Feat/refactor typography
w3b3d3v · Oct 15, 2023 · f996a52 · f996a52
2 parents 5493c08 + c4cda43
commit f996a52
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/public/index.html b/public/index.html
@@ -8,6 +8,7 @@
   <meta name="theme-color" content="#1975ff" />
   <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
   <link href="https://fonts.googleapis.com/css2?family=Inter:ital,wght@0,400&display=swap" rel="stylesheet" />
+  <link href="https://fonts.googleapis.com/css2?family=Public+Sans&display=swap" rel="stylesheet">
   <title>Web3Task</title>
   <meta name="description"
     content="High performance React template built with lots of powerful Material-UI components across multiple product niches for fast & perfect apps development processes." />

diff --git a/src/components/Cover/CoverAdminOptions.tsx b/src/components/Cover/CoverAdminOptions.tsx
@@ -16,7 +16,7 @@ const CoverAdminOptions = () => {
 
             <Box>
                 <Box>
-                    <Typography color={'green'} fontFamily='istok' fontSize={50}>
+                    <Typography color={'green'} fontSize={50}>
                         ADM OPTIONS
                     </Typography>
                 </Box>

diff --git a/src/components/Cover/CoverCreateTask.tsx b/src/components/Cover/CoverCreateTask.tsx
@@ -7,7 +7,7 @@ const CoverCreateTask = () => {
             <Box>
 
                 <Box>
-                    <Typography color={'green'} fontFamily='istok' fontSize={50}>
+                    <Typography color={'green'} fontSize={50}>
                         CREATE TASK
                     </Typography>
                 </Box>

diff --git a/src/components/Cover/CoverHomeTasks.tsx b/src/components/Cover/CoverHomeTasks.tsx
@@ -16,7 +16,7 @@ const CoverHomeTasks = () => {
 
             <Box>
                 <Box>
-                    <Typography color={'green'} fontFamily='istok' fontSize={50}>
+                    <Typography color={'green'} fontSize={50}>
                         WEB3TASK
                     </Typography>
                 </Box>

diff --git a/src/components/Cover/CoverUserProfile.tsx b/src/components/Cover/CoverUserProfile.tsx
@@ -7,7 +7,7 @@ const CoverCreateTask = () => {
             <Box>
 
                 <Box>
-                    <Typography color={'green'} fontFamily='istok' fontSize={50}>
+                    <Typography color={'green'} fontSize={50}>
                         PERSONAL PROFILE
                     </Typography>
                 </Box>

diff --git a/src/theme/schemes/DarkTheme.ts b/src/theme/schemes/DarkTheme.ts
@@ -1194,6 +1194,9 @@ export const DarkTheme = createTheme({
           fontSize: 17,
           lineHeight: 1.7,
         },
+        root: {
+          fontFamily: 'Public Sans'
+        },
       },
     },
 
@@ -1203,7 +1206,7 @@ export const DarkTheme = createTheme({
   },
   typography: {
     fontFamily:
-      '"Istok", -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"',
+      '"Istok", Public Sans, -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"',
     h1: {
       fontWeight: 700,
       fontSize: 35,

diff --git a/src/theme/schemes/LightTheme.ts b/src/theme/schemes/LightTheme.ts
@@ -1184,6 +1184,9 @@ export const LightTheme = createTheme({
           fontSize: 17,
           lineHeight: 1.7,
         },
+        root: {
+          fontFamily: 'Public Sans'
+        },
       },
     },
 
@@ -1193,7 +1196,7 @@ export const LightTheme = createTheme({
   },
   typography: {
     fontFamily:
-      '"Istok", -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"',
+      '"Istok", Public Sans,  -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"',
     h1: {
       fontWeight: 700,
       fontSize: 35,