From 7ab035d9ba4d1b019513346291c189e7a570f70f Mon Sep 17 00:00:00 2001 From: pompurin404 Date: Sun, 11 Aug 2024 11:25:40 +0800 Subject: [PATCH] fix styles --- src/renderer/src/App.tsx | 2 +- src/renderer/src/assets/main.css | 4 ++++ src/renderer/src/components/base/base-page.tsx | 2 +- .../src/components/base/base-setting-item.tsx | 2 +- src/renderer/src/components/logs/log-item.tsx | 2 +- .../components/profiles/edit-info-modal.tsx | 2 +- .../src/components/profiles/profile-item.tsx | 9 ++++----- .../src/components/proxies/proxy-item.tsx | 2 +- .../components/resources/proxy-provider.tsx | 4 ++-- .../src/components/resources/rule-provider.tsx | 4 ++-- .../src/components/rules/rule-item.tsx | 6 +++--- .../src/components/sider/conn-card.tsx | 6 ++---- src/renderer/src/components/sider/dns-card.tsx | 4 +--- src/renderer/src/components/sider/log-card.tsx | 4 +--- .../src/components/sider/mihomo-core-card.tsx | 4 ++-- .../sider/outbound-mode-switcher.tsx | 18 +++--------------- .../src/components/sider/override-card.tsx | 4 +--- .../src/components/sider/profile-card.tsx | 8 ++++---- .../src/components/sider/proxy-card.tsx | 8 +++----- .../src/components/sider/resource-card.tsx | 2 +- .../src/components/sider/rule-card.tsx | 8 +++----- .../src/components/sider/sniff-card.tsx | 2 +- .../src/components/sider/sysproxy-switcher.tsx | 2 +- .../src/components/sider/tun-switcher.tsx | 4 +--- src/renderer/src/pages/connections.tsx | 4 ++-- src/renderer/src/pages/dns.tsx | 16 ++++++++-------- src/renderer/src/pages/proxies.tsx | 4 ++-- src/renderer/src/pages/settings.tsx | 2 +- src/renderer/src/pages/sniffer.tsx | 4 ++-- src/renderer/src/pages/syspeoxy.tsx | 6 +++--- src/renderer/src/pages/tun.tsx | 6 +++--- 31 files changed, 66 insertions(+), 89 deletions(-) diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx index 8311931..d74a4db 100644 --- a/src/renderer/src/App.tsx +++ b/src/renderer/src/App.tsx @@ -37,7 +37,7 @@ const App: React.FC = () => {
-

Mihomo Party

+

Mihomo Party

-
+
{calcTraffic(upload)}/s
@@ -56,9 +56,7 @@ const ConnCard: React.FC = () => {
-

- 连接 -

+

连接

) diff --git a/src/renderer/src/components/sider/dns-card.tsx b/src/renderer/src/components/sider/dns-card.tsx index e68b1d8..c5e08d8 100644 --- a/src/renderer/src/components/sider/dns-card.tsx +++ b/src/renderer/src/components/sider/dns-card.tsx @@ -45,9 +45,7 @@ const DNSCard: React.FC = () => {
-

- DNS -

+

DNS

) diff --git a/src/renderer/src/components/sider/log-card.tsx b/src/renderer/src/components/sider/log-card.tsx index 9d9bbec..c3261be 100644 --- a/src/renderer/src/components/sider/log-card.tsx +++ b/src/renderer/src/components/sider/log-card.tsx @@ -28,9 +28,7 @@ const LogCard: React.FC = () => {
-

- 日志 -

+

日志

) diff --git a/src/renderer/src/components/sider/mihomo-core-card.tsx b/src/renderer/src/components/sider/mihomo-core-card.tsx index 3cc48e1..bff2cef 100644 --- a/src/renderer/src/components/sider/mihomo-core-card.tsx +++ b/src/renderer/src/components/sider/mihomo-core-card.tsx @@ -40,7 +40,7 @@ const MihomoCoreCard: React.FC = () => {

{version?.version ?? '-'}

@@ -64,7 +64,7 @@ const MihomoCoreCard: React.FC = () => {

内核设置

{calcTraffic(mem)}

diff --git a/src/renderer/src/components/sider/outbound-mode-switcher.tsx b/src/renderer/src/components/sider/outbound-mode-switcher.tsx index 46ba5ba..c4c96a7 100644 --- a/src/renderer/src/components/sider/outbound-mode-switcher.tsx +++ b/src/renderer/src/components/sider/outbound-mode-switcher.tsx @@ -19,21 +19,9 @@ const OutboundModeSwitcher: React.FC = () => { selectedKey={mode} onSelectionChange={(key: Key) => onChangeMode(key as OutboundMode)} > - - - + + + ) } diff --git a/src/renderer/src/components/sider/override-card.tsx b/src/renderer/src/components/sider/override-card.tsx index 3ecb734..220b62c 100644 --- a/src/renderer/src/components/sider/override-card.tsx +++ b/src/renderer/src/components/sider/override-card.tsx @@ -37,9 +37,7 @@ const OverrideCard: React.FC = () => {
-

- 覆写 -

+

覆写

) diff --git a/src/renderer/src/components/sider/profile-card.tsx b/src/renderer/src/components/sider/profile-card.tsx index 186c21a..b10b861 100644 --- a/src/renderer/src/components/sider/profile-card.tsx +++ b/src/renderer/src/components/sider/profile-card.tsx @@ -43,7 +43,7 @@ const ProfileCard: React.FC = () => {

{info?.name}

@@ -85,7 +85,7 @@ const ProfileCard: React.FC = () => {
{info.type === 'remote' && (
{extra ? `${calcTraffic(usage)}/${calcTraffic(total)}` : undefined} {dayjs(info.updated).fromNow()} @@ -93,7 +93,7 @@ const ProfileCard: React.FC = () => { )} {info.type === 'local' && (
{ {extra && ( )} diff --git a/src/renderer/src/components/sider/proxy-card.tsx b/src/renderer/src/components/sider/proxy-card.tsx index 9195b6d..7ddd53c 100644 --- a/src/renderer/src/components/sider/proxy-card.tsx +++ b/src/renderer/src/components/sider/proxy-card.tsx @@ -39,11 +39,11 @@ const ProxyCard: React.FC = () => { match ? { base: 'border-white', - content: 'text-white select-none' + content: 'text-white' } : { base: 'border-primary', - content: 'text-primary select-none' + content: 'text-primary' } } size="sm" @@ -55,9 +55,7 @@ const ProxyCard: React.FC = () => {
-

- 代理组 -

+

代理组

) diff --git a/src/renderer/src/components/sider/resource-card.tsx b/src/renderer/src/components/sider/resource-card.tsx index 2fa49eb..e1f4f4a 100644 --- a/src/renderer/src/components/sider/resource-card.tsx +++ b/src/renderer/src/components/sider/resource-card.tsx @@ -30,7 +30,7 @@ const ResourceCard: React.FC = () => {
-

+

外部资源

diff --git a/src/renderer/src/components/sider/rule-card.tsx b/src/renderer/src/components/sider/rule-card.tsx index 7401718..335bd93 100644 --- a/src/renderer/src/components/sider/rule-card.tsx +++ b/src/renderer/src/components/sider/rule-card.tsx @@ -36,11 +36,11 @@ const RuleCard: React.FC = () => { match ? { base: 'border-white', - content: 'text-white select-none' + content: 'text-white' } : { base: 'border-primary', - content: 'text-primary select-none' + content: 'text-primary' } } size="sm" @@ -52,9 +52,7 @@ const RuleCard: React.FC = () => {
-

- 规则 -

+

规则

) diff --git a/src/renderer/src/components/sider/sniff-card.tsx b/src/renderer/src/components/sider/sniff-card.tsx index 62a37ea..896b9fd 100644 --- a/src/renderer/src/components/sider/sniff-card.tsx +++ b/src/renderer/src/components/sider/sniff-card.tsx @@ -45,7 +45,7 @@ const SniffCard: React.FC = () => {
-

+

域名嗅探

diff --git a/src/renderer/src/components/sider/sysproxy-switcher.tsx b/src/renderer/src/components/sider/sysproxy-switcher.tsx index 989ce3c..0d5b28a 100644 --- a/src/renderer/src/components/sider/sysproxy-switcher.tsx +++ b/src/renderer/src/components/sider/sysproxy-switcher.tsx @@ -49,7 +49,7 @@ const SysproxySwitcher: React.FC = () => {
-

+

系统代理

diff --git a/src/renderer/src/components/sider/tun-switcher.tsx b/src/renderer/src/components/sider/tun-switcher.tsx index f864be6..8f5b146 100644 --- a/src/renderer/src/components/sider/tun-switcher.tsx +++ b/src/renderer/src/components/sider/tun-switcher.tsx @@ -76,9 +76,7 @@ const TunSwitcher: React.FC = () => {
-

+

虚拟网卡

diff --git a/src/renderer/src/pages/connections.tsx b/src/renderer/src/pages/connections.tsx index 2128598..84a4d06 100644 --- a/src/renderer/src/pages/connections.tsx +++ b/src/renderer/src/pages/connections.tsx @@ -58,7 +58,7 @@ const Connections: React.FC = () => { title="连接" header={
-
+
下载: {calcTraffic(connectionsInfo?.downloadTotal ?? 0)}{' '} @@ -99,7 +99,7 @@ const Connections: React.FC = () => { }} isHeaderSticky isStriped - className="h-[calc(100vh-100px)] p-2 select-none" + className="h-[calc(100vh-100px)] p-2" > 类型 diff --git a/src/renderer/src/pages/dns.tsx b/src/renderer/src/pages/dns.tsx index a941b39..1e497a2 100644 --- a/src/renderer/src/pages/dns.tsx +++ b/src/renderer/src/pages/dns.tsx @@ -160,9 +160,9 @@ const DNS: React.FC = () => { selectedKey={values.enhancedMode} onSelectionChange={(key: Key) => setValues({ ...values, enhancedMode: key as DnsMode })} > - - - + + + {values.enhancedMode === 'fake-ip' ? ( @@ -178,7 +178,7 @@ const DNS: React.FC = () => { />
-

真实IP回应

+

真实IP回应

{renderListInputs('fakeIPFilter', '例: +.lan')}
@@ -204,12 +204,12 @@ const DNS: React.FC = () => {
-

代理节点域名解析

+

代理节点域名解析

{renderListInputs('proxyServerNameserver', '例: tls://223.5.5.5')}
-

DNS服务器

+

DNS服务器

{renderListInputs('nameserver', '例: tls://223.5.5.5')}
@@ -245,7 +245,7 @@ const DNS: React.FC = () => { } />
- : + :
{ } />
- : + :
{ /> ) : null}
-
+
{groups[index].name}
@@ -189,7 +189,7 @@ const Proxies: React.FC = () => {
{proxyDisplayMode === 'full' && ( - + {groups[index].all.length} )} diff --git a/src/renderer/src/pages/settings.tsx b/src/renderer/src/pages/settings.tsx index f75cd40..15408bf 100644 --- a/src/renderer/src/pages/settings.tsx +++ b/src/renderer/src/pages/settings.tsx @@ -208,7 +208,7 @@ const Settings: React.FC = () => { -
v{version}
+
v{version}
diff --git a/src/renderer/src/pages/sniffer.tsx b/src/renderer/src/pages/sniffer.tsx index c73c8de..1674792 100644 --- a/src/renderer/src/pages/sniffer.tsx +++ b/src/renderer/src/pages/sniffer.tsx @@ -153,7 +153,7 @@ const Sniffer: React.FC = () => { />
-

跳过嗅探域名

+

跳过嗅探域名

{[...values.skipDomain, ''].map((d, index) => (
{
-

强制嗅探域名

+

强制嗅探域名

{[...values.forceDomain, ''].map((d, index) => (
{ selectedKey={values.mode} onSelectionChange={(key: Key) => setValues({ ...values, mode: key as SysProxyMode })} > - - + + {platform === 'win32' && ( @@ -171,7 +171,7 @@ const Sysproxy: React.FC = () => {
-

代理绕过

+

代理绕过

{[...values.bypass, ''].map((domain, index) => (
{ selectedKey={values.stack} onSelectionChange={(key: Key) => setValues({ ...values, stack: key as TunStack })} > - - - + + +