From d5ab87a00ee07b7670e20e494171855629117be8 Mon Sep 17 00:00:00 2001 From: heronlancellot Date: Sun, 15 Oct 2023 17:53:45 -0300 Subject: [PATCH 1/2] Feat: Add Public Sans typography root --- public/index.html | 1 + src/theme/schemes/DarkTheme.ts | 5 ++++- src/theme/schemes/LightTheme.ts | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index 41fcda0..ef76c8f 100644 --- a/public/index.html +++ b/public/index.html @@ -8,6 +8,7 @@ + Web3Task diff --git a/src/theme/schemes/DarkTheme.ts b/src/theme/schemes/DarkTheme.ts index 595065c..b9f305f 100644 --- 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 index d52a079..e4c9b00 100644 --- 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, From c4cda433653cd561359c60273406bd19966970e6 Mon Sep 17 00:00:00 2001 From: heronlancellot Date: Sun, 15 Oct 2023 17:54:59 -0300 Subject: [PATCH 2/2] Fix: Typography in cover --- src/components/Cover/CoverAdminOptions.tsx | 2 +- src/components/Cover/CoverCreateTask.tsx | 2 +- src/components/Cover/CoverHomeTasks.tsx | 2 +- src/components/Cover/CoverUserProfile.tsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Cover/CoverAdminOptions.tsx b/src/components/Cover/CoverAdminOptions.tsx index aab5946..1596833 100644 --- a/src/components/Cover/CoverAdminOptions.tsx +++ b/src/components/Cover/CoverAdminOptions.tsx @@ -16,7 +16,7 @@ const CoverAdminOptions = () => { - + ADM OPTIONS diff --git a/src/components/Cover/CoverCreateTask.tsx b/src/components/Cover/CoverCreateTask.tsx index 79ee21c..3087f9c 100644 --- a/src/components/Cover/CoverCreateTask.tsx +++ b/src/components/Cover/CoverCreateTask.tsx @@ -7,7 +7,7 @@ const CoverCreateTask = () => { - + CREATE TASK diff --git a/src/components/Cover/CoverHomeTasks.tsx b/src/components/Cover/CoverHomeTasks.tsx index 14a4061..9e7c726 100644 --- a/src/components/Cover/CoverHomeTasks.tsx +++ b/src/components/Cover/CoverHomeTasks.tsx @@ -16,7 +16,7 @@ const CoverHomeTasks = () => { - + WEB3TASK diff --git a/src/components/Cover/CoverUserProfile.tsx b/src/components/Cover/CoverUserProfile.tsx index 7b56e86..24d959d 100644 --- a/src/components/Cover/CoverUserProfile.tsx +++ b/src/components/Cover/CoverUserProfile.tsx @@ -7,7 +7,7 @@ const CoverCreateTask = () => { - + PERSONAL PROFILE