correct some variants

Author: ameer2468

apps/desktop/src/components/CapErrorBoundary.tsx

@@ -28,7 +28,7 @@ export function CapErrorBoundary(props: ParentProps) {
 								onClick={() => {
 									location.reload();
 								}}
-								variant="secondary"
+								variant="gray"
 							>
 								Reload
 							</Button>

apps/desktop/src/routes/(window-chrome)/new-main/index.tsx

@@ -25,7 +25,6 @@ import {
 	Suspense,
 } from "solid-js";
 import { reconcile } from "solid-js/store";
-import { addEventListener } from "solid-js/web";
 import Tooltip from "~/components/Tooltip";
 import { generalSettingsStore } from "~/store";
 import { createSignInMutation } from "~/utils/auth";
@@ -378,7 +377,7 @@ function Page() {
 								signIn.variables?.abort();
 								signIn.reset();
 							}}
-							variant="secondary"
+							variant="gray"
 							class="w-full"
 						>
 							Cancel Sign In

apps/desktop/src/routes/(window-chrome)/settings/integrations/s3-config.tsx

@@ -264,7 +264,7 @@ export default function S3ConfigPage() {
 								{deleteConfig.isPending ? "Removing..." : "Remove Config"}
 							</Button>
 						)}
-						<Button variant="secondary" onClick={() => events.emit("test")}>
+						<Button variant="gray" onClick={() => events.emit("test")}>
 							{testConfig.isPending ? "Testing..." : "Test Connection"}
 						</Button>
 					</div>

apps/desktop/src/routes/(window-chrome)/settings/license.tsx

@@ -260,7 +260,7 @@ function CommercialLicensePurchase() {
 						<Button
 							onClick={() => openCommercialCheckout.mutate()}
 							disabled={openCommercialCheckout.isPending}
-							variant="lightdark"
+							variant="dark"
 							class="w-full !rounded-full mt-10 !h-[48px] text-lg font-medium"
 							size="lg"
 						>

apps/desktop/src/routes/(window-chrome)/setup.tsx

@@ -492,7 +492,7 @@ function Startup(props: { onClose: () => void }) {
 							<Match when={ostype() !== "windows"}>
 								<Button
 									class="px-12 text-lg shadow-[0_0_30px_rgba(0,0,0,0.1)]"
-									variant="secondary"
+									variant="gray"
 									size="lg"
 									onClick={handleGetStarted}
 								>

apps/desktop/src/routes/(window-chrome)/upgrade.tsx

@@ -1,22 +1,9 @@
 import { createRive } from "@aerofoil/rive-solid-canvas";
 import { Button } from "@cap/ui-solid";
-import { action, useAction } from "@solidjs/router";
 import { createMutation, useQueryClient } from "@tanstack/solid-query";
-import { invoke } from "@tauri-apps/api/core";
-import { listen } from "@tauri-apps/api/event";
 import { getCurrentWindow, Window } from "@tauri-apps/api/window";
-import { onOpenUrl } from "@tauri-apps/plugin-deep-link";
-import * as shell from "@tauri-apps/plugin-shell";
-import {
-	type Accessor,
-	createSignal,
-	onCleanup,
-	onMount,
-	Show,
-} from "solid-js";
+import { type Accessor, createSignal, Show } from "solid-js";
 import { generalSettingsStore } from "~/store";
-import { identifyUser, trackEvent } from "~/utils/analytics";
-import { clientEnv } from "~/utils/env";
 import { getProPlanId } from "~/utils/plans";
 import { createLicenseQuery } from "~/utils/queries";
 import { commands } from "~/utils/tauri";
@@ -437,7 +424,7 @@ export default function Page() {
 										<Button
 											onClick={() => openCommercialCheckout.mutate()}
 											disabled={openCommercialCheckout.isPending}
-											variant="lightdark"
+											variant="dark"
 											class="w-full !rounded-full !h-[48px] text-lg font-medium"
 											size="lg"
 										>

apps/desktop/src/routes/editor/Editor.tsx

@@ -11,7 +11,6 @@ import {
 	createSignal,
 	Match,
 	on,
-	onMount,
 	Show,
 	Switch,
 } from "solid-js";
@@ -386,7 +385,7 @@ function Dialogs() {
 												<div class="flex flex-row items-center space-x-[0.5rem] text-gray-11">
 													<Tooltip content="Rule of Thirds">
 														<Button
-															variant="secondary"
+															variant="gray"
 															size="xs"
 															class={cx(
 																"flex items-center justify-center text-center rounded-full h-[2rem] w-[2rem] border text-[0.875rem] focus:border-blue-9",

apps/desktop/src/routes/editor/ui.tsx

@@ -189,7 +189,7 @@ export const Dialog = {
 	},
 	CloseButton() {
 		return (
-			<KDialog.CloseButton as={Button} variant="secondary">
+			<KDialog.CloseButton as={Button} variant="gray">
 				Cancel
 			</KDialog.CloseButton>
 		);

apps/desktop/src/styles/theme.css

@@ -163,7 +163,6 @@
 	box-shadow: 0 1.5px 0 0 rgba(255, 255, 255, 0.4) inset;
 }
 
-
 [data-transparent-window] {
 	background: transparent !important;
 }

packages/ui-solid/src/Button.stories.tsx

@@ -26,7 +26,7 @@ export const _Button: Story = {
 						{(size) => <option value={size}>{size}</option>}
 					</For>
 				</select>
-				<table class="border-spacing-2 border-separate text-sm text-left">
+				<table class="text-sm text-left border-separate border-spacing-2">
 					<thead>
 						<tr>
 							<th />
@@ -44,7 +44,7 @@ export const _Button: Story = {
 								</Button>
 							</td>
 							<td>
-								<Button variant="secondary" size={size()}>
+								<Button variant="gray" size={size()}>
 									Button
 								</Button>
 							</td>
@@ -92,7 +92,7 @@ export const _Button: Story = {
 								</Button>
 							</td>
 							<td>
-								<Button variant="secondary" size={size()} disabled>
+								<Button variant="gray" size={size()} disabled>
 									Button
 								</Button>
 							</td>