From 27ea9b2aedc011d51c00647dbb3214969f77b99c Mon Sep 17 00:00:00 2001 From: Michael Chen Date: Fri, 9 May 2025 22:07:20 +1000 Subject: [PATCH 1/3] fix: button font size is now 13px --- client/src/Utils/Theme/globalTheme.js | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/Utils/Theme/globalTheme.js b/client/src/Utils/Theme/globalTheme.js index 6a6724150..13442ace1 100644 --- a/client/src/Utils/Theme/globalTheme.js +++ b/client/src/Utils/Theme/globalTheme.js @@ -147,6 +147,7 @@ const baseTheme = (palette) => ({ ], height: 34, fontWeight: 400, + fontSize: "var(--env-var-font-size-medium)", borderRadius: 4, boxShadow: "none", textTransform: "none", From 2ee381f0b7680c9f0e5d07e0c42adcd90e24abb6 Mon Sep 17 00:00:00 2001 From: Michael Chen Date: Fri, 9 May 2025 22:12:50 +1000 Subject: [PATCH 2/3] fix: changed from space indentation to tabs --- client/src/Utils/Theme/globalTheme.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/Utils/Theme/globalTheme.js b/client/src/Utils/Theme/globalTheme.js index 13442ace1..ca32a3ad6 100644 --- a/client/src/Utils/Theme/globalTheme.js +++ b/client/src/Utils/Theme/globalTheme.js @@ -147,7 +147,7 @@ const baseTheme = (palette) => ({ ], height: 34, fontWeight: 400, - fontSize: "var(--env-var-font-size-medium)", + fontSize: "var(--env-var-font-size-medium)", borderRadius: 4, boxShadow: "none", textTransform: "none", From 6304212645d232ae8f421fc2d9a03e51c81dc9fd Mon Sep 17 00:00:00 2001 From: Michael Chen Date: Sat, 10 May 2025 02:31:16 +1000 Subject: [PATCH 3/3] fix: removed css reference, theme fontSize changed --- client/src/Utils/Theme/globalTheme.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/src/Utils/Theme/globalTheme.js b/client/src/Utils/Theme/globalTheme.js index ca32a3ad6..f7feed7fd 100644 --- a/client/src/Utils/Theme/globalTheme.js +++ b/client/src/Utils/Theme/globalTheme.js @@ -9,7 +9,7 @@ const shadow = const baseTheme = (palette) => ({ typography: { fontFamily: fontFamilyPrimary, - fontSize: 14, + fontSize: typographyLevels.base, h1: { fontSize: typographyLevels.xl, color: palette.primary.contrastText, @@ -147,7 +147,6 @@ const baseTheme = (palette) => ({ ], height: 34, fontWeight: 400, - fontSize: "var(--env-var-font-size-medium)", borderRadius: 4, boxShadow: "none", textTransform: "none",