fix: font family not works in some interfaces, close #639

libnyanpasu · Jun 29, 2023 · f032228 · f032228
1 parent 6cf174c
commit f032228
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/components/log/log-item.tsx b/src/components/log/log-item.tsx
@@ -1,11 +1,12 @@
 import { styled, Box } from "@mui/material";
 
-const Item = styled(Box)(({ theme: { palette } }) => ({
+const Item = styled(Box)(({ theme: { palette, typography } }) => ({
   padding: "8px 0",
   margin: "0 12px",
   lineHeight: 1.35,
   borderBottom: `1px solid ${palette.divider}`,
   fontSize: "0.875rem",
+  fontFamily: typography.fontFamily,
   userSelect: "text",
   "& .time": {
     color: palette.text.secondary,

diff --git a/src/components/proxy/proxy-item-mini.tsx b/src/components/proxy/proxy-item-mini.tsx
@@ -166,19 +166,21 @@ export const ProxyItemMini = (props: Props) => {
   );
 };
 
-const Widget = styled(Box)(() => ({
+const Widget = styled(Box)(({ theme: { typography } }) => ({
   padding: "3px 6px",
   fontSize: 14,
+  fontFamily: typography.fontFamily,
   borderRadius: "4px",
 }));
 
-const TypeBox = styled(Box)(({ theme }) => ({
+const TypeBox = styled(Box)(({ theme: { palette, typography } }) => ({
   display: "inline-block",
   border: "1px solid #ccc",
-  borderColor: alpha(theme.palette.text.secondary, 0.36),
-  color: alpha(theme.palette.text.secondary, 0.42),
+  borderColor: alpha(palette.text.secondary, 0.36),
+  color: alpha(palette.text.secondary, 0.42),
   borderRadius: 4,
   fontSize: 10,
+  fontFamily: typography.fontFamily,
   marginRight: "4px",
   padding: "0 2px",
   lineHeight: 1.25,