diff --git a/packages/frontend/src/App.css b/packages/frontend/src/App.css index 19f940f..b2dcc3a 100644 --- a/packages/frontend/src/App.css +++ b/packages/frontend/src/App.css @@ -66,10 +66,10 @@ --muted-foreground: oklch(0.556 0 0); --accent: oklch(0.97 0 0); --accent-foreground: oklch(0.205 0 0); - --destructive: oklch(0.577 0.245 27.325); + --destructive: oklch(61.275% 0.20731 24.986); --border: oklch(73.802% 0.00008 271.152); --input: oklch(0.922 0 0); - --ring: oklch(0.708 0 0); + --ring: var(--personality); --chart-1: oklch(0.646 0.222 41.116); --chart-2: oklch(0.6 0.118 184.704); --chart-3: oklch(0.398 0.07 227.392); @@ -105,7 +105,7 @@ --destructive: oklch(0.704 0.191 22.216); --border: oklch(100% 0.00011 271.152 / 0.22); --input: oklch(1 0 0 / 15%); - --ring: oklch(0.556 0 0); + --ring: var(--personality); --chart-1: oklch(0.488 0.243 264.376); --chart-2: oklch(0.696 0.17 162.48); --chart-3: oklch(0.769 0.188 70.08); @@ -132,6 +132,10 @@ background-color: var(--personality); color: var(--background); } + a:focus-visible { + outline: 1px solid var(--personality); + outline-offset: 2px; + } } * { diff --git a/packages/frontend/src/components/issue-comments.tsx b/packages/frontend/src/components/issue-comments.tsx index 1b2e99e..1370867 100644 --- a/packages/frontend/src/components/issue-comments.tsx +++ b/packages/frontend/src/components/issue-comments.tsx @@ -118,7 +118,6 @@ export function IssueComments({ issueId, className }: { issueId: number; classNa {isAuthor ? ( handleDelete(comment)} disabled={deletingId === comment.Comment.id} title="Delete comment" diff --git a/packages/frontend/src/components/issues-table.tsx b/packages/frontend/src/components/issues-table.tsx index bd8c4a7..68140ae 100644 --- a/packages/frontend/src/components/issues-table.tsx +++ b/packages/frontend/src/components/issues-table.tsx @@ -147,32 +147,33 @@ export function IssuesTable({ e.preventDefault(); }; + const showId = columns.id == null || columns.id === true; + const showTitle = columns.title == null || columns.title === true; + const showDescription = columns.description == null || columns.description === true; + const showAssignee = columns.assignee == null || columns.assignee === true; + return ( - {(columns.id == null || columns.id === true) && ( + {showId && ( ID )} - {(columns.title == null || columns.title === true) && ( - Title - )} - {(columns.description == null || columns.description === true) && ( + {showTitle && Title} + {showDescription && ( Description )} {/* below is kept blank to fill the space, used as the "Assignee" column */} - {(columns.assignee == null || columns.assignee === true) && ( - - )} + {showAssignee && } {issues.map((issueData) => ( { if (issueData.Issue.id === selectedIssueId) { selectIssue(null); @@ -181,8 +182,13 @@ export function IssuesTable({ selectIssue(issueData); }} > - {(columns.id == null || columns.id === true) && ( - + {showId && ( + )} - {(columns.title == null || columns.title === true) && ( - + {showTitle && ( + )} - {(columns.description == null || columns.description === true) && ( + {showDescription && ( )} - {(columns.assignee == null || columns.assignee === true) && ( + {showAssignee && ( - + Delete )} @@ -872,7 +872,7 @@ function Organisations({ trigger }: { trigger?: ReactNode }) { }); }} > - + Delete )} @@ -951,7 +951,7 @@ function Organisations({ trigger }: { trigger?: ReactNode }) { }} className="hover:bg-destructive/10" > - + Delete diff --git a/packages/frontend/src/components/timer-controls.tsx b/packages/frontend/src/components/timer-controls.tsx index d783dcc..3dabd4e 100644 --- a/packages/frontend/src/components/timer-controls.tsx +++ b/packages/frontend/src/components/timer-controls.tsx @@ -75,11 +75,9 @@ export function TimerControls({
{running ? ( @@ -87,14 +85,7 @@ export function TimerControls({ )} - +
diff --git a/packages/frontend/src/components/ui/button.tsx b/packages/frontend/src/components/ui/button.tsx index ef71add..73db5c9 100644 --- a/packages/frontend/src/components/ui/button.tsx +++ b/packages/frontend/src/components/ui/button.tsx @@ -11,7 +11,7 @@ const buttonVariants = cva( variant: { default: "bg-primary text-primary-foreground hover:bg-primary/90", destructive: - "bg-destructive text-white hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60", + "bg-destructive text-white hover:bg-destructive/80 active:bg-destructive/70 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60 dark:hover:bg-destructive/70", outline: "bg-transparent border dark:hover:bg-muted/40", secondary: "bg-secondary text-secondary-foreground hover:bg-secondary/80", ghost: "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50", diff --git a/packages/frontend/src/components/ui/icon-button.tsx b/packages/frontend/src/components/ui/icon-button.tsx index a5add3c..cd11f81 100644 --- a/packages/frontend/src/components/ui/icon-button.tsx +++ b/packages/frontend/src/components/ui/icon-button.tsx @@ -7,8 +7,8 @@ const iconButtonVariants = cva( { variants: { variant: { - default: "hover:text-foreground/70", - destructive: "text-destructive hover:text-destructive/70", + default: "hover:text-foreground/70 hover:opacity-70", + destructive: "text-destructive hover:opacity-70", yellow: "text-yellow-500 hover:text-yellow-500/70", green: "text-green-500 hover:text-green-500/70", ghost: "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50", diff --git a/packages/frontend/src/components/ui/input.tsx b/packages/frontend/src/components/ui/input.tsx index 36e7faf..933d9ce 100644 --- a/packages/frontend/src/components/ui/input.tsx +++ b/packages/frontend/src/components/ui/input.tsx @@ -26,7 +26,7 @@ function Input({ className={cn( "border-input dark:bg-input/30 flex h-9 w-full min-w-0 items-center border bg-transparent", "transition-[color,box-shadow]", - "has-[:focus-visible]:border-ring", + "has-[:focus-visible]:border-[var(--personality)] ", "aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive", "aria-invalid:border-destructive", className, diff --git a/packages/frontend/src/components/ui/switch.tsx b/packages/frontend/src/components/ui/switch.tsx index 94c4005..15f72b1 100644 --- a/packages/frontend/src/components/ui/switch.tsx +++ b/packages/frontend/src/components/ui/switch.tsx @@ -15,7 +15,7 @@ function Switch({ data-slot="switch" data-size={size} className={cn( - "peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input", + "peer data-[state=checked]:bg-personality data-[state=unchecked]:bg-input", "focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80", "group/switch inline-flex shrink-0 items-center rounded-full border border-transparent", "outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50", @@ -27,7 +27,7 @@ function Switch({ diff --git a/packages/frontend/src/pages/Timeline.tsx b/packages/frontend/src/pages/Timeline.tsx index 14d306c..6a4c3e2 100644 --- a/packages/frontend/src/pages/Timeline.tsx +++ b/packages/frontend/src/pages/Timeline.tsx @@ -330,13 +330,13 @@ export default function Timeline() { >
{showTodayLabel && (
- + TODAY