Revert "chore: switch to theme typography configuration" (janus-idp#637)

This reverts commit 5a9961d. Signed-off-by: Stan Lewis <gashcrumb@gmail.com>
RedHatInsights · Oct 23, 2023 · dc1580d · dc1580d
1 parent e01aac5
commit dc1580d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 68 deletions.
diff --git a/.changeset/cuddly-cameras-fetch.md b/.changeset/cuddly-cameras-fetch.md
diff --git a/.changeset/proud-spiders-vanish.md b/.changeset/proud-spiders-vanish.md
@@ -0,0 +1,5 @@
+---
+'app': patch
+---
+
+Revert typography changes
diff --git a/packages/app/src/themes/componentOverrides.ts b/packages/app/src/themes/componentOverrides.ts
@@ -1,24 +1,17 @@
 import { UnifiedThemeOptions } from '@backstage/theme';
-import { headerFontFamily } from './consts';
+
+const redhatFont = `@font-face {
+  font-family: 'Red Hat Font';
+  font-style: normal;
+  font-display: swap;
+  font-weight: 400;
+  src: url(/fonts/RedHatText-Regular.woff2) format('woff2'),
+    url(/fonts/RedHatText-Regular.otf) format('opentype'),
+    url(/fonts/RedHatText-Regular.ttf) format('truetype');
+}`;
 
 export const components: UnifiedThemeOptions['components'] = {
-  MuiTypography: {
-    styleOverrides: {
-      h1: {
-        fontFamily: headerFontFamily,
-      },
-      h2: {
-        fontFamily: headerFontFamily,
-      },
-      h3: {
-        fontFamily: headerFontFamily,
-      },
-      h4: {
-        fontFamily: headerFontFamily,
-      },
-      h5: {
-        fontFamily: headerFontFamily,
-      },
-    },
+  MuiCssBaseline: {
+    styleOverrides: redhatFont,
   },
 };
diff --git a/packages/app/src/themes/consts.ts b/packages/app/src/themes/consts.ts
diff --git a/packages/app/src/themes/darkTheme.ts b/packages/app/src/themes/darkTheme.ts
@@ -1,12 +1,10 @@
 import { createUnifiedTheme, themes } from '@backstage/theme';
 import { components } from './componentOverrides';
-import { pageFontFamily, typography } from './consts';
 import { pageTheme } from './pageTheme';
 import { ThemeColors } from '../types/types';
 
 export const customDarkTheme = (themeColors: ThemeColors) =>
   createUnifiedTheme({
-    fontFamily: pageFontFamily,
     palette: {
       ...themes.dark.getTheme('v5')?.palette,
       ...(themeColors.primaryColor && {
@@ -28,5 +26,4 @@ export const customDarkTheme = (themeColors: ThemeColors) =>
     defaultPageTheme: 'home',
     pageTheme: pageTheme(themeColors),
     components,
-    typography,
   });
diff --git a/packages/app/src/themes/lightTheme.ts b/packages/app/src/themes/lightTheme.ts
@@ -1,12 +1,10 @@
 import { createUnifiedTheme, themes } from '@backstage/theme';
 import { components } from './componentOverrides';
-import { pageFontFamily, typography } from './consts';
 import { pageTheme } from './pageTheme';
 import { ThemeColors } from '../types/types';
 
 export const customLightTheme = (themeColors: ThemeColors) =>
   createUnifiedTheme({
-    fontFamily: pageFontFamily,
     palette: {
       ...themes.light.getTheme('v5')?.palette,
       ...(themeColors.primaryColor && {
@@ -28,5 +26,4 @@ export const customLightTheme = (themeColors: ThemeColors) =>
     defaultPageTheme: 'home',
     pageTheme: pageTheme(themeColors),
     components,
-    typography,
   });