From 5d2ae406af78b255ff515904858ac67ceb9db37d Mon Sep 17 00:00:00 2001 From: pompurin404 Date: Thu, 26 Sep 2024 19:07:05 +0800 Subject: [PATCH] adjust styles --- .../src/components/base/border-swtich.tsx | 2 +- .../src/components/profiles/profile-item.tsx | 14 +++++------ .../src/components/sider/conn-card.tsx | 25 +++++++++++-------- .../src/components/sider/dns-card.tsx | 8 ++++-- .../src/components/sider/log-card.tsx | 8 ++++-- .../src/components/sider/mihomo-core-card.tsx | 12 +++++---- .../src/components/sider/override-card.tsx | 8 ++++-- .../src/components/sider/profile-card.tsx | 20 ++++++++------- .../src/components/sider/proxy-card.tsx | 10 +++++--- .../src/components/sider/resource-card.tsx | 6 +++-- .../src/components/sider/rule-card.tsx | 12 ++++++--- .../src/components/sider/sniff-card.tsx | 6 +++-- .../src/components/sider/substore-card.tsx | 6 +++-- .../components/sider/sysproxy-switcher.tsx | 6 +++-- .../src/components/sider/tun-switcher.tsx | 6 +++-- 15 files changed, 92 insertions(+), 57 deletions(-) diff --git a/src/renderer/src/components/base/border-swtich.tsx b/src/renderer/src/components/base/border-swtich.tsx index 16ba8584..652c72a8 100644 --- a/src/renderer/src/components/base/border-swtich.tsx +++ b/src/renderer/src/components/base/border-swtich.tsx @@ -13,7 +13,7 @@ const BorderSwitch: React.FC = (props) => { classNames={{ wrapper: cn('border-2', { 'border-transparent': !isShowBorder, - 'border-white': isShowBorder + 'border-primary-foreground': isShowBorder }), thumb: cn('absolute z-4', 'transform -translate-x-[2px]'), ...classNames diff --git a/src/renderer/src/components/profiles/profile-item.tsx b/src/renderer/src/components/profiles/profile-item.tsx index b536ab4e..2a6760fd 100644 --- a/src/renderer/src/components/profiles/profile-item.tsx +++ b/src/renderer/src/components/profiles/profile-item.tsx @@ -187,7 +187,7 @@ const ProfileItem: React.FC = (props) => { {...attributes} {...listeners} title={info?.name} - className={`text-ellipsis whitespace-nowrap overflow-hidden text-md font-bold leading-[32px] ${isCurrent ? 'text-white' : 'text-foreground'}`} + className={`text-ellipsis whitespace-nowrap overflow-hidden text-md font-bold leading-[32px] ${isCurrent ? 'text-primary-foreground' : 'text-foreground'}`} > {info?.name} @@ -208,7 +208,7 @@ const ProfileItem: React.FC = (props) => { > @@ -219,7 +219,7 @@ const ProfileItem: React.FC = (props) => { @@ -240,7 +240,7 @@ const ProfileItem: React.FC = (props) => { {info.type === 'remote' && extra && (
{`${calcTraffic(usage)}/${calcTraffic(total)}`} @@ -250,12 +250,12 @@ const ProfileItem: React.FC = (props) => { )} {info.type === 'local' && (
本地 @@ -267,7 +267,7 @@ const ProfileItem: React.FC = (props) => { diff --git a/src/renderer/src/components/sider/conn-card.tsx b/src/renderer/src/components/sider/conn-card.tsx index b5dcab3c..0b0cddd8 100644 --- a/src/renderer/src/components/sider/conn-card.tsx +++ b/src/renderer/src/components/sider/conn-card.tsx @@ -40,15 +40,12 @@ const ConnCard: React.FC = () => { useEffect(() => { setTimeout(() => { - const islight = theme === 'system' ? systemTheme === 'light' : theme.includes('light') setChartColor( match - ? 'rgba(255,255,255)' - : islight - ? window.getComputedStyle(document.documentElement).color - : 'rgb(255,255,255)' + ? `hsla(${getComputedStyle(document.documentElement).getPropertyValue('--nextui-primary-foreground')})` + : `hsla(${getComputedStyle(document.documentElement).getPropertyValue('--nextui-foreground')})` ) - }, 1000) + }, 200) }, [theme, systemTheme, match, customTheme]) const transform = tf ? { x: tf.x, y: tf.y, scaleX: 1, scaleY: 1 } : null @@ -111,10 +108,12 @@ const ConnCard: React.FC = () => { > -
+
{calcTraffic(upload)}/s
@@ -127,7 +126,9 @@ const ConnCard: React.FC = () => {
-

+

连接

@@ -175,13 +176,15 @@ 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 880a93d4..f5c1f3d2 100644 --- a/src/renderer/src/components/sider/dns-card.tsx +++ b/src/renderer/src/components/sider/dns-card.tsx @@ -57,7 +57,7 @@ const DNSCard: React.FC = () => { color="default" > {
-

DNS

+

+ DNS +

diff --git a/src/renderer/src/components/sider/log-card.tsx b/src/renderer/src/components/sider/log-card.tsx index 28a75606..0613aada 100644 --- a/src/renderer/src/components/sider/log-card.tsx +++ b/src/renderer/src/components/sider/log-card.tsx @@ -47,13 +47,17 @@ 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 3d0f143f..529b9993 100644 --- a/src/renderer/src/components/sider/mihomo-core-card.tsx +++ b/src/renderer/src/components/sider/mihomo-core-card.tsx @@ -69,7 +69,7 @@ const MihomoCoreCard: React.FC = () => { className="flex justify-between h-[32px]" >

{version?.version ?? '-'}

@@ -90,14 +90,14 @@ const MihomoCoreCard: React.FC = () => { }} >

内核设置

{calcTraffic(mem)}

@@ -122,13 +122,15 @@ const MihomoCoreCard: React.FC = () => { >
-

+

内核设置

diff --git a/src/renderer/src/components/sider/override-card.tsx b/src/renderer/src/components/sider/override-card.tsx index 6bf6f134..4cd32023 100644 --- a/src/renderer/src/components/sider/override-card.tsx +++ b/src/renderer/src/components/sider/override-card.tsx @@ -49,13 +49,17 @@ 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 dbfd6536..c01d47c0 100644 --- a/src/renderer/src/components/sider/profile-card.tsx +++ b/src/renderer/src/components/sider/profile-card.tsx @@ -75,7 +75,7 @@ const ProfileCard: React.FC = () => { >

{info?.name}

@@ -91,7 +91,7 @@ const ProfileCard: React.FC = () => { }} > {info.type === 'remote' && ( @@ -109,7 +109,7 @@ const ProfileCard: React.FC = () => { }} > @@ -118,7 +118,7 @@ const ProfileCard: React.FC = () => { {info.type === 'remote' && extra && (
{`${calcTraffic(usage)}/${calcTraffic(total)}`} @@ -128,12 +128,12 @@ const ProfileCard: React.FC = () => { )} {info.type === 'local' && (
本地 @@ -144,7 +144,7 @@ const ProfileCard: React.FC = () => { {extra && ( )} @@ -168,13 +168,15 @@ const ProfileCard: React.FC = () => { >
-

+

订阅管理

diff --git a/src/renderer/src/components/sider/proxy-card.tsx b/src/renderer/src/components/sider/proxy-card.tsx index 3abd0360..c3116575 100644 --- a/src/renderer/src/components/sider/proxy-card.tsx +++ b/src/renderer/src/components/sider/proxy-card.tsx @@ -50,15 +50,15 @@ const ProxyCard: React.FC = () => { color="default" > {
-

+

代理组

diff --git a/src/renderer/src/components/sider/resource-card.tsx b/src/renderer/src/components/sider/resource-card.tsx index bd7a0c82..0044a3a1 100644 --- a/src/renderer/src/components/sider/resource-card.tsx +++ b/src/renderer/src/components/sider/resource-card.tsx @@ -48,13 +48,15 @@ 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 5e17a233..3f042f9e 100644 --- a/src/renderer/src/components/sider/rule-card.tsx +++ b/src/renderer/src/components/sider/rule-card.tsx @@ -50,15 +50,15 @@ 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 51e4cda1..daaf88fb 100644 --- a/src/renderer/src/components/sider/sniff-card.tsx +++ b/src/renderer/src/components/sider/sniff-card.tsx @@ -59,7 +59,7 @@ const SniffCard: React.FC = () => { > { -

+

域名嗅探

diff --git a/src/renderer/src/components/sider/substore-card.tsx b/src/renderer/src/components/sider/substore-card.tsx index 45ba3093..021ddfec 100644 --- a/src/renderer/src/components/sider/substore-card.tsx +++ b/src/renderer/src/components/sider/substore-card.tsx @@ -46,13 +46,15 @@ const SubStoreCard: React.FC = () => { color="default" > -

+

Sub-Store

diff --git a/src/renderer/src/components/sider/sysproxy-switcher.tsx b/src/renderer/src/components/sider/sysproxy-switcher.tsx index f136bb2c..c77de84a 100644 --- a/src/renderer/src/components/sider/sysproxy-switcher.tsx +++ b/src/renderer/src/components/sider/sysproxy-switcher.tsx @@ -61,7 +61,7 @@ const SysproxySwitcher: React.FC = () => { color="default" > { -

+

系统代理

diff --git a/src/renderer/src/components/sider/tun-switcher.tsx b/src/renderer/src/components/sider/tun-switcher.tsx index 1f814262..64ddf082 100644 --- a/src/renderer/src/components/sider/tun-switcher.tsx +++ b/src/renderer/src/components/sider/tun-switcher.tsx @@ -98,7 +98,7 @@ const TunSwitcher: React.FC = () => { color="default" > { -

+

虚拟网卡