Merge pull request #719 from jembi/CU_86c0xa13m-fix-fonts

jembi · Nov 14, 2024 · 3220ab0 · 3220ab0
2 parents cdfd9c0 + 4c4da7e
commit 3220ab0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/packages/base-components/BasePageTemplate.tsx b/packages/base-components/BasePageTemplate.tsx
@@ -35,7 +35,7 @@ export function BasePageTemplate({
               fontSize: '34px',
               letterSpacing: '0.25px',
               lineHeight: '123.5%',
-              fontFamily: 'Fira Sans',
+              fontFamily: 'Fira Sans, Roboto, Helvetica, Arial, sans-serif',
               color: alpha('#000', 0.87),
               textAlign: 'left',
               display: 'inline-block',

diff --git a/packages/header-app/src/components/openhim.appbar.component.tsx b/packages/header-app/src/components/openhim.appbar.component.tsx
@@ -17,7 +17,6 @@ import {Page, Role, UserProfile} from '../types'
 import {getApps, getUser, getUserPermissionRoles} from '../services/api'
 import {useAlert} from '../contexts/alert.context'
 import {OpenhimLogo} from './common/openhim.logo'
-import {alpha} from '@mui/material'
 
 const DIVIDER_MENU_ITEM: Readonly<Page> = Object.freeze({
   name: '__',
@@ -31,12 +30,11 @@ const navbarTextStyle = {
   lineHeight: '24px',
   textTransform: 'capitalize',
   fontWeight: '500',
-  fontFamily: 'Roboto',
+  fontFamily: 'Roboto, Helvetica, Arial, sans-serif',
   fontStyle: 'normal',
   order: 1
 }
 
-
 export default function OpenhimAppBar() {
   const [pages, setPages] = useState<Page[]>([
     {name: 'HOME', link: '#!/portal'},
@@ -418,7 +416,10 @@ export default function OpenhimAppBar() {
                           .map((child, index, items) =>
                             child.name == DIVIDER_MENU_ITEM.name ? null : (
                               <MenuItem
-                                divider={items[index + 1]?.name == DIVIDER_MENU_ITEM.name}
+                                divider={
+                                  items[index + 1]?.name ==
+                                  DIVIDER_MENU_ITEM.name
+                                }
                                 key={child.name}
                                 onClick={() =>
                                   handleCloseMoreMenu(
@@ -469,14 +470,14 @@ export default function OpenhimAppBar() {
                             fontWeight: 500,
                             marginRight: '20px',
                             color: '#049D84',
-                            fontFamily:"Roboto",  
+                            fontFamily: 'Roboto',
                             lineHeight: '24px'
                           }
                         : {
                             textTransform: 'none',
                             fontWeight: 500,
                             marginRight: '20px',
-                            fontFamily:"Roboto",                            
+                            fontFamily: 'Roboto',
                             color: 'rgba(0, 0, 0, 0.6)'
                           }
                     }
@@ -505,7 +506,7 @@ export default function OpenhimAppBar() {
                               textTransform: 'capitalize',
                               fontWeight: 500,
                               marginRight: '20px',
-                              fontFamily:"Roboto",  
+                              fontFamily: 'Roboto',
                               color: '#049D84'
                             }
                           : {
@@ -514,7 +515,7 @@ export default function OpenhimAppBar() {
                               textTransform: 'capitalize',
                               fontWeight: 500,
                               marginRight: '20px',
-                              fontFamily:"Roboto",
+                              fontFamily: 'Roboto',
                               color: 'rgba(0, 0, 0, 0.6)'
                             }
                       }
@@ -545,7 +546,9 @@ export default function OpenhimAppBar() {
                         .map((child, index, items) =>
                           child.name == DIVIDER_MENU_ITEM.name ? null : (
                             <MenuItem
-                              divider={items[index + 1]?.name == DIVIDER_MENU_ITEM.name}
+                              divider={
+                                items[index + 1]?.name == DIVIDER_MENU_ITEM.name
+                              }
                               key={child.name}
                               onClick={() =>
                                 handleCloseMoreMenu(getCorrectAnchorEl(page)[1])
@@ -556,7 +559,10 @@ export default function OpenhimAppBar() {
                               component="a"
                               href={child.link}
                             >
-                              <Typography sx={navbarTextStyle} textAlign="center">
+                              <Typography
+                                sx={navbarTextStyle}
+                                textAlign="center"
+                              >
                                 {child.name}
                               </Typography>
                             </MenuItem>