From e2b2c5912f4b02a16a209b6dcbb006152ce65951 Mon Sep 17 00:00:00 2001 From: Edbury Enegren Date: Tue, 22 Aug 2023 11:43:52 -0600 Subject: [PATCH] fix(odyssey-react-mui): ensure headings pick up TypographyFamilyHeading --- packages/odyssey-react-mui/src/Typography.tsx | 2 +- packages/odyssey-react-mui/src/theme/components.tsx | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/odyssey-react-mui/src/Typography.tsx b/packages/odyssey-react-mui/src/Typography.tsx index fef304356a..53c242bc63 100644 --- 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 index 565cbbedce..a53e418d3d 100644 --- a/packages/odyssey-react-mui/src/theme/components.tsx +++ b/packages/odyssey-react-mui/src/theme/components.tsx @@ -2271,8 +2271,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",