adjust the light mode style

This commit is contained in:
pompurin404 2024-08-05 16:48:27 +08:00
parent d68b2686f7
commit a1dc5cae4c
No known key found for this signature in database
13 changed files with 92 additions and 59 deletions

View File

@ -13,7 +13,7 @@ const BorderSwitch: React.FC<SiderSwitchProps> = (props) => {
classNames={{ classNames={{
wrapper: cn('border-2', { wrapper: cn('border-2', {
'border-transparent': !isShowBorder, 'border-transparent': !isShowBorder,
'border-foreground': isShowBorder 'border-white': isShowBorder
}), }),
thumb: cn('absolute z-4', 'transform -translate-x-[2px]'), thumb: cn('absolute z-4', 'transform -translate-x-[2px]'),
...classNames ...classNames

View File

@ -122,7 +122,9 @@ const ProfileItem: React.FC<Props> = (props) => {
<Card fullWidth isPressable onPress={onClick} className={isCurrent ? 'bg-primary' : ''}> <Card fullWidth isPressable onPress={onClick} className={isCurrent ? 'bg-primary' : ''}>
<CardBody className="pb-1"> <CardBody className="pb-1">
<div className="flex justify-between h-[32px]"> <div className="flex justify-between h-[32px]">
<h3 className="select-none text-ellipsis whitespace-nowrap overflow-hidden text-md font-bold leading-[32px]"> <h3
className={`select-none text-ellipsis whitespace-nowrap overflow-hidden text-md font-bold leading-[32px] ${isCurrent ? 'text-white' : 'text-foreground'}`}
>
{info?.name} {info?.name}
</h3> </h3>
<div className="flex"> <div className="flex">
@ -141,13 +143,16 @@ const ProfileItem: React.FC<Props> = (props) => {
> >
<IoMdRefresh <IoMdRefresh
color="default" color="default"
className={`text-[24px] ${updating ? 'animate-spin' : ''}`} className={`${isCurrent ? 'text-white' : 'text-foreground'} text-[24px] ${updating ? 'animate-spin' : ''}`}
/> />
</Button> </Button>
<Dropdown> <Dropdown>
<DropdownTrigger> <DropdownTrigger>
<Button isIconOnly size="sm" variant="light" color="default"> <Button isIconOnly size="sm" variant="light" color="default">
<IoMdMore color="default" className="text-[24px]" /> <IoMdMore
color="default"
className={`text-[24px] ${isCurrent ? 'text-white' : 'text-foreground'}`}
/>
</Button> </Button>
</DropdownTrigger> </DropdownTrigger>
<DropdownMenu onAction={onMenuAction}> <DropdownMenu onAction={onMenuAction}>
@ -165,7 +170,9 @@ const ProfileItem: React.FC<Props> = (props) => {
</Dropdown> </Dropdown>
</div> </div>
</div> </div>
<div className="mt-2 flex justify-between"> <div
className={`mt-2 flex justify-between ${isCurrent ? 'text-white' : 'text-foreground'}`}
>
<small>{extra ? `${calcTraffic(usage)}/${calcTraffic(total)}` : undefined}</small> <small>{extra ? `${calcTraffic(usage)}/${calcTraffic(total)}` : undefined}</small>
<small>{dayjs(info.updated).fromNow()}</small> <small>{dayjs(info.updated).fromNow()}</small>
</div> </div>
@ -174,7 +181,10 @@ const ProfileItem: React.FC<Props> = (props) => {
{extra && ( {extra && (
<Progress <Progress
className="w-full" className="w-full"
classNames={{ indicator: 'bg-foreground', label: 'select-none' }} classNames={{
indicator: isCurrent ? 'bg-white' : 'bg-foreground',
label: 'select-none'
}}
value={calcPercent(extra?.upload, extra?.download, extra?.total)} value={calcPercent(extra?.upload, extra?.download, extra?.total)}
/> />
)} )}

View File

@ -38,9 +38,12 @@ const ConnCard: React.FC = () => {
variant="flat" variant="flat"
color="default" color="default"
> >
<IoLink color="default" className="text-[20px]" /> <IoLink
color="default"
className={`${match ? 'text-white' : 'text-foreground'} text-[24px]`}
/>
</Button> </Button>
<div className="p-2 w-full select-none"> <div className={`p-2 w-full select-none ${match ? 'text-white' : 'text-foreground'} `}>
<div className="flex justify-between"> <div className="flex justify-between">
<div className="w-full text-right mr-2">{calcTraffic(upload)}/s</div> <div className="w-full text-right mr-2">{calcTraffic(upload)}/s</div>
<FaCircleArrowUp className="h-[24px] leading-[24px]" /> <FaCircleArrowUp className="h-[24px] leading-[24px]" />
@ -53,7 +56,9 @@ const ConnCard: React.FC = () => {
</div> </div>
</CardBody> </CardBody>
<CardFooter className="pt-1"> <CardFooter className="pt-1">
<h3 className="select-none text-md font-bold"></h3> <h3 className={`select-none text-md font-bold ${match ? 'text-white' : 'text-foreground'}`}>
</h3>
</CardFooter> </CardFooter>
</Card> </Card>
) )

View File

@ -20,12 +20,17 @@ const LogCard: React.FC = () => {
variant="flat" variant="flat"
color="default" color="default"
> >
<IoJournal color="default" className="text-[20px]" /> <IoJournal
color="default"
className={`${match ? 'text-white' : 'text-foreground'} text-[20px] font-bold`}
/>
</Button> </Button>
</div> </div>
</CardBody> </CardBody>
<CardFooter className="pt-1"> <CardFooter className="pt-1">
<h3 className="select-none text-md font-bold"></h3> <h3 className={`select-none text-md font-bold ${match ? 'text-white' : 'text-foreground'}`}>
</h3>
</CardFooter> </CardFooter>
</Card> </Card>
) )

View File

@ -39,7 +39,9 @@ const MihomoCoreCard: React.FC = () => {
> >
<CardBody> <CardBody>
<div className="flex justify-between h-[32px]"> <div className="flex justify-between h-[32px]">
<h3 className="select-none text-md font-bold leading-[32px]"> <h3
className={`select-none text-md font-bold leading-[32px] ${match ? 'text-white' : 'text-foreground'} `}
>
{version?.version ?? '-'} {version?.version ?? '-'}
</h3> </h3>
@ -52,14 +54,16 @@ const MihomoCoreCard: React.FC = () => {
restartCore() restartCore()
}} }}
> >
<IoMdRefresh color="default" className="text-[24px]" /> <IoMdRefresh className={`${match ? 'text-white' : 'text-foreground'} text-[24px]`} />
</Button> </Button>
</div> </div>
</CardBody> </CardBody>
<CardFooter className="pt-1"> <CardFooter className="pt-1">
<div className="flex justify-between w-full"> <div
<h4 className="select-none text-md font-bold"></h4> className={`flex justify-between w-full select-none text-md font-bold ${match ? 'text-white' : 'text-foreground'}`}
<h4 className="select-none text-md">{calcTraffic(mem)}</h4> >
<h4></h4>
<h4>{calcTraffic(mem)}</h4>
</div> </div>
</CardFooter> </CardFooter>
</Card> </Card>

View File

@ -24,7 +24,10 @@ const OverrideCard: React.FC = () => {
variant="flat" variant="flat"
color="default" color="default"
> >
<MdFormatOverline color="default" className="text-[24px]" /> <MdFormatOverline
color="default"
className={`${match ? 'text-white' : 'text-foreground'} text-[24px]`}
/>
</Button> </Button>
<BorderSwitch <BorderSwitch
isShowBorder={match && enable} isShowBorder={match && enable}
@ -34,7 +37,9 @@ const OverrideCard: React.FC = () => {
</div> </div>
</CardBody> </CardBody>
<CardFooter className="pt-1"> <CardFooter className="pt-1">
<h3 className="select-none text-md font-bold"></h3> <h3 className={`select-none text-md font-bold ${match ? 'text-white' : 'text-foreground'}`}>
</h3>
</CardFooter> </CardFooter>
</Card> </Card>
) )

View File

@ -37,7 +37,9 @@ const ProfileCard: React.FC = () => {
> >
<CardBody className="pb-1"> <CardBody className="pb-1">
<div className="flex justify-between h-[32px]"> <div className="flex justify-between h-[32px]">
<h3 className="select-none text-ellipsis whitespace-nowrap overflow-hidden text-md font-bold leading-[32px]"> <h3
className={`select-none text-ellipsis whitespace-nowrap overflow-hidden text-md font-bold leading-[32px] ${match ? 'text-white' : 'text-foreground'} `}
>
{info?.name} {info?.name}
</h3> </h3>
<Button <Button
@ -54,12 +56,11 @@ const ProfileCard: React.FC = () => {
}} }}
> >
<IoMdRefresh <IoMdRefresh
color="default" className={`text-[24px] ${match ? 'text-white' : 'text-foreground'} ${updating ? 'animate-spin' : ''}`}
className={`text-[24px] ${updating ? 'animate-spin' : ''}`}
/> />
</Button> </Button>
</div> </div>
<div className="mt-2 flex justify-between"> <div className={`mt-2 flex justify-between ${match ? 'text-white' : 'text-foreground'} `}>
<small>{extra ? `${calcTraffic(usage)}/${calcTraffic(total)}` : undefined}</small> <small>{extra ? `${calcTraffic(usage)}/${calcTraffic(total)}` : undefined}</small>
<small>{dayjs(info.updated).fromNow()}</small> <small>{dayjs(info.updated).fromNow()}</small>
</div> </div>
@ -68,7 +69,7 @@ const ProfileCard: React.FC = () => {
{extra && ( {extra && (
<Progress <Progress
className="w-full" className="w-full"
classNames={{ indicator: 'bg-foreground', label: 'select-none' }} classNames={{ indicator: match ? 'bg-white' : 'bg-foreground', label: 'select-none' }}
value={calcPercent(extra?.upload, extra?.download, extra?.total)} value={calcPercent(extra?.upload, extra?.download, extra?.total)}
/> />
)} )}

View File

@ -24,14 +24,16 @@ const ProxyCard: React.FC = () => {
variant="flat" variant="flat"
color="default" color="default"
> >
<SiNginxproxymanager color="default" className="text-[20px]" /> <SiNginxproxymanager
className={`${match ? 'text-white' : 'text-foreground'} text-[24px] font-bold`}
/>
</Button> </Button>
<Chip <Chip
classNames={ classNames={
match match
? { ? {
base: 'border-foreground', base: 'border-white',
content: 'text-foreground' content: 'text-white'
} }
: { : {
base: 'border-primary', base: 'border-primary',
@ -47,7 +49,9 @@ const ProxyCard: React.FC = () => {
</div> </div>
</CardBody> </CardBody>
<CardFooter className="pt-1"> <CardFooter className="pt-1">
<h3 className="select-none text-md font-bold"></h3> <h3 className={`select-none text-md font-bold ${match ? 'text-white' : 'text-foreground'}`}>
</h3>
</CardFooter> </CardFooter>
</Card> </Card>
) )

View File

@ -26,14 +26,17 @@ const RuleCard: React.FC = () => {
variant="flat" variant="flat"
color="default" color="default"
> >
<IoGitNetwork color="default" className="text-[20px]" /> <IoGitNetwork
color="default"
className={`${match ? 'text-white' : 'text-foreground'} text-[20px]`}
/>
</Button> </Button>
<Chip <Chip
classNames={ classNames={
match match
? { ? {
base: 'border-foreground', base: 'border-white',
content: 'text-foreground' content: 'text-white'
} }
: { : {
base: 'border-primary', base: 'border-primary',
@ -49,7 +52,9 @@ const RuleCard: React.FC = () => {
</div> </div>
</CardBody> </CardBody>
<CardFooter className="pt-1"> <CardFooter className="pt-1">
<h3 className="select-none text-md font-bold"></h3> <h3 className={`select-none text-md font-bold ${match ? 'text-white' : 'text-foreground'}`}>
</h3>
</CardFooter> </CardFooter>
</Card> </Card>
) )

View File

@ -37,7 +37,9 @@ const SysproxySwitcher: React.FC = () => {
variant="flat" variant="flat"
color="default" color="default"
> >
<AiOutlineGlobal color="default" className="text-[24px]" /> <AiOutlineGlobal
className={`${match ? 'text-white' : 'text-foreground'} text-[24px] font-bold`}
/>
</Button> </Button>
<BorderSwitch <BorderSwitch
isShowBorder={match && enable} isShowBorder={match && enable}
@ -47,7 +49,9 @@ const SysproxySwitcher: React.FC = () => {
</div> </div>
</CardBody> </CardBody>
<CardFooter className="pt-1"> <CardFooter className="pt-1">
<h3 className="select-none text-md font-bold"></h3> <h3 className={`select-none text-md font-bold ${match ? 'text-white' : 'text-foreground'}`}>
</h3>
</CardFooter> </CardFooter>
</Card> </Card>
) )

View File

@ -22,12 +22,17 @@ const TestCard: React.FC = () => {
variant="flat" variant="flat"
color="default" color="default"
> >
<TbWorldCheck color="default" className="text-[20px]" /> <TbWorldCheck
color="default"
className={`${match ? 'text-white' : 'text-foreground'} text-[20px] font-bold`}
/>
</Button> </Button>
</div> </div>
</CardBody> </CardBody>
<CardFooter className="pt-1"> <CardFooter className="pt-1">
<h3 className="select-none text-md font-bold"></h3> <h3 className={`select-none text-md font-bold ${match ? 'text-white' : 'text-foreground'}`}>
</h3>
</CardFooter> </CardFooter>
</Card> </Card>
) )

View File

@ -60,7 +60,9 @@ const TunSwitcher: React.FC = () => {
variant="flat" variant="flat"
color="default" color="default"
> >
<TbDeviceIpadHorizontalBolt color="default" className="text-[24px] font-bold" /> <TbDeviceIpadHorizontalBolt
className={`${match ? 'text-white' : 'text-foreground'} text-[24px] font-bold`}
/>
</Button> </Button>
<BorderSwitch <BorderSwitch
isShowBorder={match && enable} isShowBorder={match && enable}
@ -70,7 +72,11 @@ const TunSwitcher: React.FC = () => {
</div> </div>
</CardBody> </CardBody>
<CardFooter className="pt-1"> <CardFooter className="pt-1">
<h3 className="select-none text-md font-bold"></h3> <h3
className={`select-none text-md font-bold ${match ? 'text-white' : 'text-foreground'}`}
>
</h3>
</CardFooter> </CardFooter>
</Card> </Card>
</> </>

View File

@ -10,26 +10,5 @@ module.exports = {
extend: {} extend: {}
}, },
darkMode: 'class', darkMode: 'class',
plugins: [ plugins: [nextui()]
nextui({
themes: {
dark: {
colors: {
primary: {
DEFAULT: '#006FEE',
foreground: '#FFFFFF'
}
}
},
light: {
colors: {
primary: {
DEFAULT: '#41C3F8',
foreground: '#000000'
}
}
}
}
})
]
} }