Skip to content

Commit 71415c8

Browse files
refactor: remove unused sidebar styles and update button variant
- Removed unused sidebar-related CSS variables and styles from global.css - Updated default button variant to use new color tokens and shadow styles - Simplified global.css by removing redundant base layer styles
1 parent 1059f6e commit 71415c8

File tree

2 files changed

+2
-38
lines changed

2 files changed

+2
-38
lines changed

app/global.css

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,6 @@
126126

127127
--color-base-none: #ffffff00;
128128
--radius: 0.5rem;
129-
--sidebar: hsl(0 0% 98%);
130-
--sidebar-foreground: hsl(240 5.3% 26.1%);
131-
--sidebar-primary: hsl(240 5.9% 10%);
132-
--sidebar-primary-foreground: hsl(0 0% 98%);
133-
--sidebar-accent: hsl(240 4.8% 95.9%);
134-
--sidebar-accent-foreground: hsl(240 5.9% 10%);
135-
--sidebar-border: hsl(220 13% 91%);
136-
--sidebar-ring: hsl(217.2 91.2% 59.8%);
137129
}
138130

139131
.dark {
@@ -249,14 +241,6 @@
249241
--color-yellow-700: #ffe3a6;
250242
--color-yellow-800: #ffefcc;
251243
--color-yellow-900: #fff7e5;
252-
--sidebar: hsl(240 5.9% 10%);
253-
--sidebar-foreground: hsl(240 4.8% 95.9%);
254-
--sidebar-primary: hsl(224.3 76.3% 48%);
255-
--sidebar-primary-foreground: hsl(0 0% 100%);
256-
--sidebar-accent: hsl(240 3.7% 15.9%);
257-
--sidebar-accent-foreground: hsl(240 4.8% 95.9%);
258-
--sidebar-border: hsl(240 3.7% 15.9%);
259-
--sidebar-ring: hsl(217.2 91.2% 59.8%);
260244
}
261245

262246
@theme inline {
@@ -316,15 +300,6 @@
316300
--shadow-error: 0px 0px 0px 2px var(--color-ant-error-color-outline);
317301
--shadow-focus: 0px 0px 0px 2px #fff, 0px 0px 0px 4px #3069fe;
318302
--shadow-nc-sm: 0px 3px 1px -2px rgba(0, 0, 0, 0.06), 0px 5px 3px -2px rgba(0, 0, 0, 0.02);
319-
--color-sidebar-ring: var(--sidebar-ring);
320-
--color-sidebar-border: var(--sidebar-border);
321-
--color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
322-
--color-sidebar-accent: var(--sidebar-accent);
323-
--color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
324-
--color-sidebar-primary: var(--sidebar-primary);
325-
--color-sidebar-foreground: var(--sidebar-foreground);
326-
--color-sidebar: var(--sidebar);
327-
328303
}
329304

330305
@theme inline {
@@ -681,15 +656,4 @@
681656
}
682657
}
683658
}
684-
}
685-
686-
/*---break---*/
687-
688-
@layer base {
689-
* {
690-
@apply border-border;
691-
}
692-
body {
693-
@apply bg-background text-foreground;
694-
}
695659
}

components/ui/button.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const buttonVariants = cva(
99
{
1010
variants: {
1111
variant: {
12-
default: "bg-primary text-primary-foreground hover:bg-primary/90",
12+
default: "bg-nc-fill-primary-default text-primary-foreground shadow-xs hover:bg-nc-fill-primary-hover",
1313
destructive:
1414
"bg-destructive text-white shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
1515
outline:
@@ -19,7 +19,7 @@ const buttonVariants = cva(
1919
ghost:
2020
"hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
2121
link: "text-primary underline-offset-4 hover:underline",
22-
none: ""
22+
none: "",
2323
},
2424
size: {
2525
default: "h-9 px-4 py-2 has-[>svg]:px-3",

0 commit comments

Comments
 (0)