mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-01-29 17:15:38 +08:00
update clashmeta core, Imporve UI, merge PR, reset icons, fix CI
This commit is contained in:
@@ -8,7 +8,7 @@ export const defaultTheme = {
|
||||
error_color: "#d32f2f",
|
||||
warning_color: "#ed6c02",
|
||||
success_color: "#2e7d32",
|
||||
font_family: `"Roboto", "Helvetica", "Arial", sans-serif, "twemoji mozilla"`,
|
||||
font_family: `"twemoji mozilla", "Roboto", "Helvetica", "Arial", sans-serif`,
|
||||
};
|
||||
|
||||
// dark mode
|
||||
|
||||
@@ -142,7 +142,7 @@ const ConnectionsPage = () => {
|
||||
</Box>
|
||||
}
|
||||
>
|
||||
<Paper sx={{ boxShadow: 0, height: "100%" }}>
|
||||
<Box sx={{ boxShadow: 0, height: "100%" }}>
|
||||
<Box
|
||||
sx={{
|
||||
pt: 1,
|
||||
@@ -210,7 +210,7 @@ const ConnectionsPage = () => {
|
||||
</Box>
|
||||
|
||||
<ConnectionDetail ref={detailRef} />
|
||||
</Paper>
|
||||
</Box>
|
||||
</BasePage>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -64,7 +64,7 @@ const LogPage = () => {
|
||||
</Box>
|
||||
}
|
||||
>
|
||||
<Paper
|
||||
<Box
|
||||
sx={{
|
||||
boxSizing: "border-box",
|
||||
boxShadow: 0,
|
||||
@@ -121,7 +121,7 @@ const LogPage = () => {
|
||||
<BaseEmpty text="No Logs" />
|
||||
)}
|
||||
</Box>
|
||||
</Paper>
|
||||
</Box>
|
||||
</BasePage>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -295,7 +295,7 @@ const ProfilePage = () => {
|
||||
</Stack>
|
||||
|
||||
<Box sx={{ mb: 4.5 }}>
|
||||
<Grid container spacing={{ xs: 2, lg: 3 }}>
|
||||
<Grid container spacing={{ xs: 1, lg: 1 }}>
|
||||
{regularItems.map((item) => (
|
||||
<Grid item xs={12} sm={6} md={4} lg={3} key={item.file}>
|
||||
<ProfileItem
|
||||
@@ -311,7 +311,7 @@ const ProfilePage = () => {
|
||||
</Box>
|
||||
|
||||
{enhanceItems.length > 0 && (
|
||||
<Grid container spacing={{ xs: 2, lg: 3 }}>
|
||||
<Grid container spacing={{ xs: 2, lg: 2 }}>
|
||||
{enhanceItems.map((item) => (
|
||||
<Grid item xs={12} sm={6} md={4} lg={3} key={item.file}>
|
||||
<ProfileMore
|
||||
|
||||
@@ -72,17 +72,16 @@ const ProxyPage = () => {
|
||||
</Box>
|
||||
}
|
||||
>
|
||||
<Paper
|
||||
<Box
|
||||
sx={{
|
||||
borderRadius: 1,
|
||||
boxShadow: 0,
|
||||
height: "100%",
|
||||
boxSizing: "border-box",
|
||||
py: 1,
|
||||
}}
|
||||
>
|
||||
<ProxyGroups mode={curMode!} />
|
||||
</Paper>
|
||||
</Box>
|
||||
</BasePage>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -19,7 +19,7 @@ const RulesPage = () => {
|
||||
|
||||
return (
|
||||
<BasePage title={t("Rules")} contentStyle={{ height: "100%" }}>
|
||||
<Paper sx={{ boxSizing: "border-box", boxShadow: 0, height: "100%" }}>
|
||||
<Box sx={{ boxSizing: "border-box", boxShadow: 0, height: "100%" }}>
|
||||
<Box
|
||||
sx={{
|
||||
pt: 1,
|
||||
@@ -57,7 +57,7 @@ const RulesPage = () => {
|
||||
<BaseEmpty text="No Rules" />
|
||||
)}
|
||||
</Box>
|
||||
</Paper>
|
||||
</Box>
|
||||
</BasePage>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Grid, IconButton, Paper } from "@mui/material";
|
||||
import { Box, Grid, IconButton, Paper } from "@mui/material";
|
||||
import { useLockFn } from "ahooks";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { BasePage, Notice } from "@/components/base";
|
||||
@@ -33,19 +33,19 @@ const SettingPage = () => {
|
||||
</IconButton>
|
||||
}
|
||||
>
|
||||
<Grid container spacing={{ xs: 2, lg: 3 }}>
|
||||
<Grid container spacing={{ xs: 1, lg: 1 }}>
|
||||
<Grid item xs={12} md={6}>
|
||||
<Paper sx={{ borderRadius: 1, boxShadow: 2, marginBottom: 2 }}>
|
||||
<Box sx={{ borderRadius: 1, boxShadow: 2, marginBottom: 1 }}>
|
||||
<SettingSystem onError={onError} />
|
||||
</Paper>
|
||||
<Paper sx={{ borderRadius: 1, boxShadow: 2 }}>
|
||||
</Box>
|
||||
<Box sx={{ borderRadius: 1, boxShadow: 2 }}>
|
||||
<SettingClash onError={onError} />
|
||||
</Paper>
|
||||
</Box>
|
||||
</Grid>
|
||||
<Grid item xs={12} md={6}>
|
||||
<Paper sx={{ borderRadius: 1, boxShadow: 2 }}>
|
||||
<Box sx={{ borderRadius: 1, boxShadow: 2 }}>
|
||||
<SettingVerge onError={onError} />
|
||||
</Paper>
|
||||
</Box>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</BasePage>
|
||||
|
||||
Reference in New Issue
Block a user