Skip to content

Commit 300641f

Browse files
committed
Merge remote-tracking branch 'origin/main' into update-pricing-page-style
2 parents e436368 + 10baa39 commit 300641f

File tree

39 files changed

+147
-101
lines changed

39 files changed

+147
-101
lines changed

.changeset/eleven-games-relate.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/strong-taxis-clap.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

apps/webapp/app/components/BulkActionFilterSummary.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ import { appliedSummary, dateFromString, timeFilterRenderValues } from "./runs/v
1111
import { formatNumber } from "~/utils/numberFormatter";
1212
import { SpinnerWhite } from "./primitives/Spinner";
1313
import { ArrowPathIcon, CheckIcon, XCircleIcon } from "@heroicons/react/20/solid";
14+
import { XCircleIcon as XCircleIconOutline } from "@heroicons/react/24/outline";
1415
import assertNever from "assert-never";
1516
import { AppliedFilter } from "./primitives/AppliedFilter";
1617
import { runStatusTitle } from "./runs/v3/TaskRunStatus";
17-
import { type TaskRunStatus } from "@trigger.dev/database";
18+
import type { TaskRunStatus } from "@trigger.dev/database";
1819

1920
export const BulkActionMode = z.union([z.literal("selected"), z.literal("filter")]);
2021
export type BulkActionMode = z.infer<typeof BulkActionMode>;
@@ -244,7 +245,7 @@ function Action({ action }: { action: BulkActionAction }) {
244245
case "cancel":
245246
return (
246247
<span>
247-
<XCircleIcon className="mb-0.5 inline-block size-4 text-error" />
248+
<XCircleIconOutline className="mb-0.5 inline-block size-4 text-error" />
248249
<span className="ml-0.5 text-text-bright">Canceled</span>
249250
</span>
250251
);

apps/webapp/app/components/navigation/AccountSideMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { LockClosedIcon, ShieldCheckIcon, UserCircleIcon } from "@heroicons/react/20/solid";
22
import { ArrowLeftIcon } from "@heroicons/react/24/solid";
3-
import { type User } from "@trigger.dev/database";
3+
import type { User } from "@trigger.dev/database";
44
import { cn } from "~/utils/cn";
55
import {
66
accountPath,

apps/webapp/app/components/primitives/Avatar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
RocketLaunchIcon,
77
StarIcon,
88
} from "@heroicons/react/20/solid";
9-
import { type Prisma } from "@trigger.dev/database";
9+
import type { Prisma } from "@trigger.dev/database";
1010
import { z } from "zod";
1111
import { logger } from "~/services/logger.server";
1212
import { cn } from "~/utils/cn";

apps/webapp/app/components/primitives/RadioButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const variants = {
3939
description: {
4040
button:
4141
"w-full p-2.5 hover:data-[state=checked]:bg-white/[4%] data-[state=checked]:bg-white/[4%] transition data-[disabled]:opacity-70 hover:border-charcoal-600 border-charcoal-650 hover:data-[state=checked]:border-charcoal-600 border rounded-md",
42-
label: "text-text-bright font-semibold -mt-1 text-left text-sm",
42+
label: "text-text-bright font-semibold -mt-0.5 text-left text-sm",
4343
description: "text-text-dimmed -mt-0 text-left",
4444
inputPosition: "mt-0",
4545
icon: "w-8 h-8 mb-2",

apps/webapp/app/components/runs/v3/BatchStatus.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { CheckCircleIcon, XCircleIcon } from "@heroicons/react/20/solid";
2-
import { BatchTaskRunStatus } from "@trigger.dev/database";
2+
import type { BatchTaskRunStatus } from "@trigger.dev/database";
33
import assertNever from "assert-never";
44
import { Spinner } from "~/components/primitives/Spinner";
55
import { cn } from "~/utils/cn";

apps/webapp/app/components/runs/v3/BulkAction.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ArrowPathIcon, CheckCircleIcon, NoSymbolIcon } from "@heroicons/react/20/solid";
2-
import { BulkActionStatus, type BulkActionType } from "@trigger.dev/database";
2+
import type { BulkActionStatus, BulkActionType } from "@trigger.dev/database";
33
import assertNever from "assert-never";
44
import { Spinner } from "~/components/primitives/Spinner";
55
import { cn } from "~/utils/cn";

apps/webapp/app/components/runs/v3/DeploymentStatus.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
NoSymbolIcon,
55
XCircleIcon,
66
} from "@heroicons/react/20/solid";
7-
import { WorkerDeploymentStatus } from "@trigger.dev/database";
7+
import type { WorkerDeploymentStatus } from "@trigger.dev/database";
88
import assertNever from "assert-never";
99
import { Spinner } from "~/components/primitives/Spinner";
1010
import { cn } from "~/utils/cn";

apps/webapp/app/components/runs/v3/ScheduleFilters.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { MagnifyingGlassIcon, XMarkIcon } from "@heroicons/react/20/solid";
22
import { useNavigate } from "@remix-run/react";
3-
import { type RuntimeEnvironment } from "@trigger.dev/database";
43
import { useCallback } from "react";
54
import { z } from "zod";
65
import { Input } from "~/components/primitives/Input";

0 commit comments

Comments
 (0)