fix: adjust style

This commit is contained in:
GyDi 2022-11-23 17:42:01 +08:00
parent db028665fd
commit ffa21fbfd2
No known key found for this signature in database
GPG Key ID: 9C3AD40F1F99880A
6 changed files with 36 additions and 8 deletions

View File

@ -4,7 +4,11 @@ body {
"Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
sans-serif; sans-serif;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
user-select: none; user-select: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
} }
:root { :root {
@ -37,3 +41,10 @@ body {
background-color: rgba(18, 18, 18, 1); background-color: rgba(18, 18, 18, 1);
} }
} }
.user-none {
user-select: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
}

View File

@ -14,6 +14,9 @@
flex-direction: column; flex-direction: column;
box-sizing: border-box; box-sizing: border-box;
user-select: none; user-select: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
overflow: hidden; overflow: hidden;
$maxLogo: 100px; $maxLogo: 100px;

View File

@ -1,9 +1,10 @@
import { mutate } from "swr"; import { mutate } from "swr";
import { useState } from "react"; import { useState } from "react";
import { useLockFn } from "ahooks"; import { useLockFn } from "ahooks";
import { Menu, MenuItem } from "@mui/material"; import { IconButton, Menu, MenuItem } from "@mui/material";
import { Settings } from "@mui/icons-material"; import { Settings } from "@mui/icons-material";
import { changeClashCore } from "@/services/cmds"; import { changeClashCore } from "@/services/cmds";
import { closeAllConnections } from "@/services/api";
import { useVerge } from "@/hooks/use-verge"; import { useVerge } from "@/hooks/use-verge";
import { Notice } from "@/components/base"; import { Notice } from "@/components/base";
@ -24,6 +25,7 @@ export const CoreSwitch = () => {
if (core === clash_core) return; if (core === clash_core) return;
try { try {
closeAllConnections();
await changeClashCore(core); await changeClashCore(core);
mutateVerge(); mutateVerge();
setTimeout(() => { setTimeout(() => {
@ -39,15 +41,20 @@ export const CoreSwitch = () => {
return ( return (
<> <>
<Settings <IconButton
fontSize="small" color="inherit"
style={{ cursor: "pointer", opacity: 0.75 }} size="small"
onClick={(event) => { onClick={(event) => {
const { clientX, clientY } = event; const { clientX, clientY } = event;
setPosition({ top: clientY, left: clientX }); setPosition({ top: clientY, left: clientX });
setAnchorEl(event.currentTarget); setAnchorEl(event.currentTarget);
}} }}
/> >
<Settings
fontSize="inherit"
style={{ cursor: "pointer", opacity: 0.75 }}
/>
</IconButton>
<Menu <Menu
open={!!anchorEl} open={!!anchorEl}

View File

@ -19,7 +19,7 @@ export const SettingItem: React.FC<ItemProps> = (props) => {
label label
) : ( ) : (
<Box sx={{ display: "flex", alignItems: "center" }}> <Box sx={{ display: "flex", alignItems: "center" }}>
<span style={{ marginRight: 4 }}>{label}</span> <span>{label}</span>
{extra} {extra}
</Box> </Box>
); );

View File

@ -167,7 +167,7 @@ const SettingVerge = ({ onError }: Props) => {
</SettingItem> </SettingItem>
<SettingItem label={t("Verge Version")}> <SettingItem label={t("Verge Version")}>
<Typography sx={{ py: "7px" }}>v{version}</Typography> <Typography sx={{ py: "7px", pr: 1 }}>v{version}</Typography>
</SettingItem> </SettingItem>
</SettingList> </SettingList>
); );

View File

@ -65,7 +65,14 @@ const LogPage = () => {
</Box> </Box>
} }
> >
<Paper sx={{ boxSizing: "border-box", boxShadow: 2, height: "100%" }}> <Paper
sx={{
boxSizing: "border-box",
boxShadow: 2,
height: "100%",
userSelect: "text",
}}
>
<Box <Box
sx={{ sx={{
pt: 1, pt: 1,