Skip to content

Commit 8ae33f7

Browse files
Merge pull request #31 from MasterFrontEndYu/main
fix:some
2 parents f2351c1 + 445772b commit 8ae33f7

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

packages/ui/src/badge/badge.tsx

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@ const badgeStyles = tv(
77
base: "inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none",
88
variants: {
99
variant: {
10-
default:
11-
"border-transparent bg-zinc-900 text-zinc-50 hover:bg-zinc-900/80 dark:bg-zinc-50 dark:text-zinc-900",
10+
default: "border-transparent bg-reveral-bg text-reveral",
1211
secondary:
1312
"border-transparent bg-zinc-100 text-zinc-900 hover:bg-zinc-100/80 dark:bg-zinc-800 dark:text-zinc-50",
14-
outline:
15-
"text-zinc-950 border-base dark:text-zinc-50",
13+
outline: "text-main border-light",
1614
success:
1715
"border-transparent bg-emerald-100 text-emerald-800 dark:bg-emerald-900/30 dark:text-emerald-400",
1816
danger: "border-transparent bg-red-100 text-red-800 dark:bg-red-900/30 dark:text-red-400",
@@ -30,14 +28,13 @@ const badgeStyles = tv(
3028
type BadgeVariants = VariantProps<typeof badgeStyles>;
3129

3230
export interface BadgeProps
33-
extends ComponentProps<typeof KBadge>,
34-
BadgeVariants {}
31+
extends ComponentProps<typeof KBadge>, BadgeVariants {}
3532

3633
export const Badge = (props: BadgeProps) => {
3734
const [local, variantProps, others] = splitProps(
3835
props,
3936
["class"],
40-
["variant"]
37+
["variant"],
4138
);
4239

4340
return (

packages/ui/src/style/global.css

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,20 @@
77
--warning: var(--color-orange-600);
88
--danger: var(--color-red-600);
99

10-
--app-bg: var(--color-white); /* 应用背景色 */
10+
--app-bg: var(--color-white); /* 应用背景色 */
11+
--app-bg-reveral: var(--color-zinc-900); /* 应用反转背景色 */
1112
--app-foreground: var(--color-zinc-100); /* 应用前景色 */
12-
--app-text-main: var(--color-zinc-950); /* 应用主文字色 */
13+
--app-text-main: var(--color-zinc-950); /* 应用主文字色 */
1314
--app-text-muted: var(--color-zinc-600); /* 应用次级文字色*/
1415
--app-border: var(--color-zinc-500); /* 应用边框色*/
1516
--app-border-light: var(--color-zinc-300); /* 应用浅边框色 */
1617
--app-ring: var(--color-zinc-300);
1718
--app-text-reversal: var(--color-zinc-100); /* 应用反转文字色 */
18-
1919
}
2020

2121
[data-theme="dark"] {
2222
--app-text-reversal: var(--color-zinc-950);
23+
--app-bg-reveral: var(--color-zinc-50);
2324
--app-bg: var(--color-zinc-950);
2425
--app-text-main: var(--color-zinc-50);
2526
--app-text-muted: var(--color-zinc-400);
@@ -32,7 +33,7 @@
3233
--app-text-main: #f3e5d8;
3334
--app-ring: #8b5e3c;
3435
}
35-
36+
3637
@keyframes accordion-down {
3738
from {
3839
height: 0;
@@ -124,6 +125,7 @@
124125

125126
--color-reversal: var(--app-text-reversal);
126127
--color-foreground: var(--app-foreground);
128+
--color-reversal-bg: var(--app-bg-reveral);
127129
--color-app: var(--app-bg);
128130
--color-main: var(--app-text-main);
129131
--color-muted: var(--app-text-muted);

0 commit comments

Comments
 (0)