Skip to content

chore: replace MoreMenu with DropdownMenu #17615

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.

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
merged 18 commits into from
May 1, 2025
Merged
Prev Previous commit
Next Next commit
chore: cleanup
  • Loading branch information
jaaydenh committed May 1, 2025
commit 732006a92f56acff4bb2cf534bb1b65eba53a0f3
2 changes: 1 addition & 1 deletion site/src/components/Spinner/Spinner.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const meta: Meta<typeof Spinner> = {
title: "components/Spinner",
component: Spinner,
args: {
children: <PlusIcon className="size-icon-md" />,
children: <PlusIcon className="size-icon-lg" />,
},
};

Expand Down
2 changes: 1 addition & 1 deletion site/src/components/Spinner/Spinner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const leaves = 8;
const spinnerVariants = cva("", {
variants: {
size: {
lg: "size-icon-md",
lg: "size-icon-lg",
sm: "size-icon-sm",
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -340,35 +340,27 @@ export const CreateWorkspacePageViewExperimental: FC<
<Label className="text-sm" htmlFor={`${id}-workspace-name`}>
Workspace name
</Label>
<div className="flex flex-col">
<Input
id={`${id}-workspace-name`}
ref={workspaceNameInputRef}
value={form.values.name}
onChange={(e) => {
form.setFieldValue("name", e.target.value.trim());
resetMutation();
<Input
id={`${id}-workspace-name`}
value={form.values.name}
onChange={(e) => {
form.setFieldValue("name", e.target.value.trim());
resetMutation();
}}
disabled={creatingWorkspace}
/>
<div className="flex gap-2 text-xs text-content-secondary items-center">
Need a suggestion?
<Button
variant="subtle"
size="sm"
onClick={async () => {
await form.setFieldValue("name", suggestedName);
rerollSuggestedName();
}}
disabled={creatingWorkspace}
/>
{form.touched.name && form.errors.name && (
<div className="text-content-destructive text-xs mt-2">
{form.errors.name}
</div>
)}
<div className="flex gap-2 text-xs text-content-secondary items-center">
Need a suggestion?
<Button
variant="subtle"
size="sm"
onClick={async () => {
await form.setFieldValue("name", suggestedName);
rerollSuggestedName();
}}
>
{suggestedName}
</Button>
</div>
>
{suggestedName}
</Button>
</div>
</div>
{permissions.createWorkspaceForAny && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ const OrganizationRow: FC<OrganizationRowProps> = ({
aria-label="delete"
onClick={() => onDelete(idpOrg)}
>
<Trash className="size-icon-sm" />
<Trash />
<span className="sr-only">Delete IdP mapping</span>
</Button>
</TableCell>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export const EditRolesButton: FC<EditRolesButtonProps> = ({
size="icon"
className="text-content-secondary hover:text-content-primary"
>
<EditSquare className="size-icon-sm" />
<EditSquare />
</Button>
</Tooltip>
</PopoverTrigger>
Expand Down
2 changes: 1 addition & 1 deletion site/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = {
sans: `"Inter Variable", system-ui, sans-serif`,
},
size: {
"icon-md": "1.5rem",
"icon-lg": "1.5rem",
"icon-sm": "1.125rem",
"icon-xs": "0.875rem",
},
Expand Down