Merge pull request #1942 from okta/ee/heading-family

fix(odyssey-react-mui): ensure headings pick up TypographyFamilyHeading
okta · Aug 22, 2023 · d8fc766 · d8fc766
2 parents 58611b2 + e2b2c59
commit d8fc766
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/packages/odyssey-react-mui/src/Typography.tsx b/packages/odyssey-react-mui/src/Typography.tsx
@@ -102,7 +102,7 @@ const Typography = ({
       if (variant === "body") {
         return "p";
       } else if (variant === "subordinate" || variant === "support") {
-        return "h6";
+        return "p";
       } else {
         return variant;
       }

diff --git a/packages/odyssey-react-mui/src/theme/components.tsx b/packages/odyssey-react-mui/src/theme/components.tsx
@@ -2278,8 +2278,6 @@ export const components = (
     },
     MuiTypography: {
       defaultProps: {
-        fontFamily:
-          "'Inter', '-apple-system', 'BlinkMacSystemFont', 'Segoe UI', 'Roboto', 'Oxygen-Sans', 'Ubuntu', 'Cantarell', 'Helvetica Neue', 'Noto Sans Arabic', sans-serif",
         variantMapping: {
           h1: "h1",
           h2: "h2",