Skip to content

improvements: export button widths, sign out/in button hover colors #924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ameer2468 merged 1 commit into from
Aug 21, 2025
Merged

improvements: export button widths, sign out/in button hover colors #924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/desktop/src/components/SignInButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export function SignInButton(
size="md"
class="flex flex-grow justify-center items-center"
{...props}
variant={signIn.isPending ? "secondary" : props.variant}
variant={signIn.isPending ? "secondary" : "primary"}
onClick={() => {
if (signIn.isPending) {
signIn.variables.abort();
Expand Down
16 changes: 8 additions & 8 deletions apps/desktop/src/routes/editor/ExportDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,17 @@ export const EXPORT_TO_OPTIONS = [
{
label: "File",
value: "file",
icon: <IconCapFile class="text-gray-12 size-4" />,
icon: <IconCapFile class="text-gray-12 size-3.5" />,
},
{
label: "Clipboard",
value: "clipboard",
icon: <IconCapCopy class="text-gray-12 size-4" />,
icon: <IconCapCopy class="text-gray-12 size-3.5" />,
},
{
label: "Shareable link",
value: "link",
icon: <IconCapLink class="text-gray-12 size-4" />,
icon: <IconCapLink class="text-gray-12 size-3.5" />,
},
] as const;

Expand Down Expand Up @@ -169,9 +169,9 @@ export function ExportDialog() {
}));

const exportButtonIcon: Record<"file" | "clipboard" | "link", JSX.Element> = {
file: <IconCapFile class="text-gray-1 size-4" />,
clipboard: <IconCapCopy class="text-gray-1 size-4" />,
link: <IconCapLink class="text-gray-1 size-4" />,
file: <IconCapFile class="text-gray-1 size-3.5" />,
clipboard: <IconCapCopy class="text-gray-1 size-3.5" />,
link: <IconCapLink class="text-gray-1 size-3.5" />,
};

const copy = createMutation(() => ({
Expand Down Expand Up @@ -372,7 +372,7 @@ export function ExportDialog() {
<>
<Show when={exportState.type === "idle"}>
<DialogContent
title="Export"
title="Export Cap"
confirm={
<>
{settings.exportTo === "link" && !auth.data ? (
Expand Down Expand Up @@ -480,7 +480,7 @@ export function ExportDialog() {
<Button
onClick={() => setSettings("exportTo", option.value)}
class={cx(
"flex gap-2 items-center",
"flex flex-1 gap-2 items-center text-nowrap",
settings.exportTo === option.value && selectedStyle,
)}
variant="secondary"
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-solid/src/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ const styles = cva(
variant: {
blue: "bg-blue-9 text-white hover:bg-blue-10 disabled:bg-gray-6 disabled:text-gray-9 outline-blue-300 disabled:outline-blue-10",
primary:
"bg-gray-12 text-gray-1 hover:bg-gray-11 enabled:hover:bg-blue-8 disabled:bg-gray-6 disabled:text-gray-9 outline-blue-300 disabled:bg-gray-4 disabled:dark:text-gray-9",
"bg-gray-12 text-gray-1 hover:bg-gray-11 enabled:hover:bg-gray-11 disabled:bg-gray-6 disabled:text-gray-9 outline-blue-300 disabled:bg-gray-4 disabled:dark:text-gray-9",
secondary:
"bg-gray-4 enabled:hover:bg-gray-5 text-gray-500 disabled:bg-gray-6 disabled:text-gray-9 outline-blue-300 disabled:outline-blue-10",
destructive:
"bg-red-300 text-gray-50 dark:text-gray-12 disabled:bg-gray-6 disabled:text-gray-9 enabled:hover:bg-red-400 disabled:bg-red-200 outline-red-300",
white:
"bg-gray-1 dark:bg-gray-12 enabled:hover:bg-gray-5 text-gray-500 dark:disabled:bg-gray-300 dark:disabled:text-gray-8 dark:text-gray-1 disabled:bg-gray-6 disabled:text-gray-9 outline-blue-300",
"bg-gray-12 hover:bg-gray-11 text-gray-1 dark:disabled:bg-gray-300 dark:disabled:text-gray-8 dark:text-gray-1 disabled:bg-gray-6 disabled:text-gray-9 outline-blue-300",
lightdark:
"bg-gray-12 hover:bg-gray-11 text-gray-1 dark:disabled:bg-gray-300 dark:disabled:text-gray-8 disabled:bg-gray-6 disabled:text-gray-9",
},
Expand Down
Loading