From 80765eb16b4e1b197b9ee9f9d21080332ace9df4 Mon Sep 17 00:00:00 2001 From: "ilya.razievskij" Date: Fri, 10 Oct 2025 20:01:22 +0300 Subject: [PATCH] fix: fixed inconsistent font --- .../Dashboard/BorrowMarketTokenTable.tsx | 6 ++- .../Dashboard/BorrowedTokenTable.tsx | 4 +- .../Dashboard/SuppliedTokenTable.tsx | 4 +- .../Dashboard/SupplyMarketTokenTable.tsx | 3 +- src/ui/src/components/Dashboard/style.ts | 2 +- src/ui/src/theme.js | 44 ++++++++++++++++++- 6 files changed, 54 insertions(+), 9 deletions(-) diff --git a/src/ui/src/components/Dashboard/BorrowMarketTokenTable.tsx b/src/ui/src/components/Dashboard/BorrowMarketTokenTable.tsx index 61f52c5d..7eca2d83 100644 --- a/src/ui/src/components/Dashboard/BorrowMarketTokenTable.tsx +++ b/src/ui/src/components/Dashboard/BorrowMarketTokenTable.tsx @@ -142,8 +142,9 @@ const BorrowMarketTokenTable = (props) => { size="medium" className={classes.borrowButton} onClick={() => handleClickMktModal(data)} + sx={{ textTransform: 'capitalize' }} > - Borrow + Borrow @@ -152,8 +153,9 @@ const BorrowMarketTokenTable = (props) => { size="medium" className={classes.detailsButton} onClick={() => handleClickDetails(data.assetType)} + sx={{ textTransform: 'capitalize' }} > - Details + Details diff --git a/src/ui/src/components/Dashboard/BorrowedTokenTable.tsx b/src/ui/src/components/Dashboard/BorrowedTokenTable.tsx index 3bf17b91..7bd0c76a 100644 --- a/src/ui/src/components/Dashboard/BorrowedTokenTable.tsx +++ b/src/ui/src/components/Dashboard/BorrowedTokenTable.tsx @@ -180,8 +180,8 @@ const BorrowedTokenTable = (props) => { - diff --git a/src/ui/src/components/Dashboard/SuppliedTokenTable.tsx b/src/ui/src/components/Dashboard/SuppliedTokenTable.tsx index 80cb8019..87bd43b6 100644 --- a/src/ui/src/components/Dashboard/SuppliedTokenTable.tsx +++ b/src/ui/src/components/Dashboard/SuppliedTokenTable.tsx @@ -213,8 +213,8 @@ const SuppliedTokenTable = (props) => { - diff --git a/src/ui/src/components/Dashboard/SupplyMarketTokenTable.tsx b/src/ui/src/components/Dashboard/SupplyMarketTokenTable.tsx index 2877665e..7b04665e 100644 --- a/src/ui/src/components/Dashboard/SupplyMarketTokenTable.tsx +++ b/src/ui/src/components/Dashboard/SupplyMarketTokenTable.tsx @@ -127,8 +127,9 @@ const SupplyMarketTokenTable = (props) => { size="medium" className={classes.supplyButton} onClick={() => handleClickMktModal(data)} + sx={{ textTransform: 'capitalize' }} > - Supply + Supply diff --git a/src/ui/src/components/Dashboard/style.ts b/src/ui/src/components/Dashboard/style.ts index 7ecf00f0..6c88a94d 100644 --- a/src/ui/src/components/Dashboard/style.ts +++ b/src/ui/src/components/Dashboard/style.ts @@ -39,7 +39,7 @@ export const useStyles = makeStyles({ }, '& .MuiTableCell-root': { color: '#000', - opacity: '0.6', + opacity: '1', fontSize: '.875rem', '@media(min-width: 768px)': { minWidth: '5.5625rem', diff --git a/src/ui/src/theme.js b/src/ui/src/theme.js index 258fb349..5fe8178d 100644 --- a/src/ui/src/theme.js +++ b/src/ui/src/theme.js @@ -2,7 +2,49 @@ import { createTheme, adaptV4Theme } from '@mui/material/styles'; const theme = createTheme(adaptV4Theme({ typography: { - fontFamily: 'Poppins, Inter' + fontFamily: [ + 'Inter', + '-apple-system', + 'BlinkMacSystemFont', + 'Segoe UI', + 'sans-serif' + ].join(','), + fontWeightRegular: 400, + fontWeightMedium: 500, + fontWeightBold: 600 + }, + components: { + MuiCssBaseline: { + styleOverrides: { + html: { + fontFamily: 'Inter, sans-serif', + }, + body: { + fontFamily: 'Inter, sans-serif', + } + } + }, + MuiButton: { + styleOverrides: { + root: { + fontFamily: 'Inter, sans-serif', + } + } + }, + MuiTableCell: { + styleOverrides: { + root: { + fontFamily: 'Inter, sans-serif', + } + } + }, + MuiTypography: { + styleOverrides: { + root: { + fontFamily: 'Inter, sans-serif', + } + } + } } }));