purgatory/clash-verge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
GyDi 2023-06-29 14:21:14 +08:00 committed by GitHub
parent 6cf174c5ed
commit f032228d0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/log/log-item.tsx
View File

@ -1,11 +1,12 @@
import { styled, Box } from "@mui/material"; import { styled, Box } from "@mui/material";
const Item = styled(Box)(({ theme: { palette } }) => ({ const Item = styled(Box)(({ theme: { palette, typography } }) => ({
padding: "8px 0", padding: "8px 0",
margin: "0 12px", margin: "0 12px",
lineHeight: 1.35, lineHeight: 1.35,
borderBottom: `1px solid ${palette.divider}`, borderBottom: `1px solid ${palette.divider}`,
fontSize: "0.875rem", fontSize: "0.875rem",
fontFamily: typography.fontFamily,
userSelect: "text", userSelect: "text",
"& .time": { "& .time": {
color: palette.text.secondary, color: palette.text.secondary,

10
src/components/proxy/proxy-item-mini.tsx
View File

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