Merge pull request #914 from layer5io/revert-907-fix/font

Revert "chore: added fontfamily for base component"

Author: amitamrutiya

src/theme/components/appbar.modifiter.ts

@@ -6,11 +6,9 @@ export const MuiAppBar: Components<Theme>['MuiAppBar'] = {
       const {
         palette: {
           background: { default: defaultBackground }
-        },
-        typography: { fontFamily }
+        }
       } = theme;
       return {
-        fontFamily,
         elevation: 2,
         background: defaultBackground
       };

src/theme/components/buttongroup.modifier.ts

@@ -3,8 +3,7 @@ import { Components, Theme } from '@mui/material';
 export const MuiButtonGroup: Components<Theme>['MuiButtonGroup'] = {
   styleOverrides: {
     grouped: ({ theme }) => ({
-      borderColor: theme.palette.common.white,
-      fontFamily: theme.typography.fontFamily
+      borderColor: theme.palette.common.white
     })
   }
 };

src/theme/components/link.modifier.ts

@@ -7,11 +7,9 @@ export const MuiLink: Components<Theme>['MuiLink'] = {
         palette: {
           text: { default: defaultText },
           background: { brand }
-        },
-        typography: { fontFamily }
+        }
       } = theme;
       return {
-        fontFamily: fontFamily,
         fontWeight: '600',
         textDecoration: 'none',
         color: defaultText,

src/theme/components/listitem.modifier.ts

@@ -20,11 +20,9 @@ export const MuiListItem: Components<Theme>['MuiListItem'] = {
             text: { default: defaultText },
             icon: { default: defaultIcon },
             background: { brand }
-          },
-          typography: { fontFamily }
+          }
         } = theme;
         return {
-          fontFamily,
           textTransform: 'none',
           margin: '.5rem 0rem .5rem .5rem',
           padding: '0rem',

src/theme/components/menu.modifier.ts

@@ -2,21 +2,13 @@ import { Components, Theme } from '@mui/material';
 
 export const MuiMenu: Components<Theme>['MuiMenu'] = {
   styleOverrides: {
-    root: ({ theme }) => {
-      const {
-        typography: { fontFamily }
-      } = theme;
-      return {
-        paper: {
-          fontFamily: fontFamily,
-          '& .MuiMenuItem-root.Mui-selected': {
-            backgroundColor: 'rgba(0, 0, 0, 0.08)',
-            '&:hover': {
-              backgroundColor: 'rgba(0, 0, 0, 0.08)'
-            }
-          }
+    paper: {
+      '& .MuiMenuItem-root.Mui-selected': {
+        backgroundColor: 'rgba(0, 0, 0, 0.08)',
+        '&:hover': {
+          backgroundColor: 'rgba(0, 0, 0, 0.08)'
         }
-      };
+      }
     }
   }
 };

src/theme/components/menuitem.modifier.ts

@@ -6,11 +6,9 @@ export const MuiMenuItem: Components<Theme>['MuiMenuItem'] = {
       const {
         palette: {
           text: { tertiary }
-        },
-        typography: { fontFamily }
+        }
       } = theme;
       return {
-        fontFamily: fontFamily,
         '&:hover': {
           '& li': {
             color: tertiary,

src/theme/components/tab.modifier.ts

@@ -7,11 +7,9 @@ export const MuiTab: Components<Theme>['MuiTab'] = {
         palette: {
           text: { default: defaultText },
           background: { tabs: defaultBackground }
-        },
-        typography: { textB1Regular }
+        }
       } = theme;
       return {
-        ...textB1Regular,
         '&.Mui-selected': {
           color: defaultText,
           backgroundColor: defaultBackground

src/theme/components/tabs.modifier.ts

@@ -3,8 +3,7 @@ import { Components, Theme } from '@mui/material';
 export const MuiTabs: Components<Theme>['MuiTabs'] = {
   styleOverrides: {
     root: ({ theme }) => ({
-      backgroundColor: theme.palette.background.tabs,
-      fontFamily: theme.typography.fontFamily
+      backgroundColor: theme.palette.background.tabs
     }),
     indicator: ({ theme }) => ({
       backgroundColor: theme.palette.background.brand?.default