Skip to content

Commit 1733981

Browse files
authored
Merge pull request #45 from SyTW2526/feature/fix-styles
fix: mejorar estilos de botones y ajustes de color en TaskCard y Task
2 parents 0b8f9fd + bb2e509 commit 1733981

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

client/src/components/tasks/TaskCard.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ export const TaskCard = memo(function TaskCard({
105105
<Icon
106106
as="IconStar"
107107
size={16}
108-
className="text-muted-foreground hover:text-yellow-400 transition-colors duration-200"
108+
className="text-muted-foreground hover:text-primary transition-colors duration-200"
109109
/>
110110
}
111111
checkedIcon={
112112
<Icon
113-
as="IconStar"
113+
as="IconStarFilled"
114114
size={16}
115-
className="fill-yellow-400 text-yellow-400"
115+
className="fill-primary text-primary"
116116
/>
117117
}
118118
/>

client/src/components/tasks/TaskFilters.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,19 +153,18 @@ interface TaskFavoriteToggleProps {
153153
export function TaskFavoriteToggle({
154154
active,
155155
onToggle,
156-
className = "",
157156
}: TaskFavoriteToggleProps) {
158157
const { t } = useTranslation();
159158

160159
return (
161160
<Button
162-
variant="outline"
161+
variant={active ? "default" : "outline"}
163162
onClick={onToggle}
164163
title={
165164
active ? t("tasks.filters.showAll") : t("tasks.filters.showFavorites")
166165
}
167166
leftIcon={active ? "IconStarFilled" : "IconStar"}
168-
className={`${active ? "bg-yellow-500 hover:bg-yellow-600 text-white border-yellow-500 hover:text-white" : ""} ${className}`}
167+
// className={`${active ? "bg-yellow-500 hover:bg-yellow-600 text-white border-yellow-500 hover:text-white" : ""} ${className}`}
169168
/>
170169
);
171170
}

client/src/components/ui/button-variants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export const buttonVariants = cva(
55
{
66
variants: {
77
variant: {
8-
default: "bg-primary text-primary-foreground hover:bg-primary/90",
8+
default: "bg-primary text-primary-foreground hover:bg-primary/90 border dark:border-input",
99
destructive:
1010
"bg-destructive text-white hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
1111
outline:

client/src/styles/index.css

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,15 @@
4343

4444
:root {
4545
--radius: 0.625rem;
46-
--background: oklch(0.975 0 0);
47-
--foreground: oklch(0.145 0 0);
48-
--card: oklch(1 0 0);
49-
--card-foreground: oklch(0.145 0 0);
50-
--popover: oklch(1 0 0);
51-
--popover-foreground: oklch(0.145 0 0);
46+
--background: oklch(0.95 0 0);
47+
/* Un poco más gris, menos blanco puro */
48+
--foreground: oklch(0.12 0 0);
49+
/* Texto aún más oscuro */
50+
--card: oklch(0.98 0 0);
51+
/* Fondo de tarjetas, más gris */
52+
--card-foreground: oklch(0.12 0 0);
53+
--popover: oklch(0.98 0 0);
54+
--popover-foreground: oklch(0.12 0 0);
5255
--primary: oklch(0.205 0 0);
5356
--primary-foreground: oklch(0.985 0 0);
5457
--secondary: oklch(0.97 0 0);
@@ -145,4 +148,4 @@
145148
margin-right: 0 !important;
146149
padding-right: 0 !important;
147150
}
148-
}
151+
}

0 commit comments

Comments
 (0)