Skip to content

Commit 63aa37e

Browse files
Bill LeoutsakosBill Leoutsakos
authored andcommitted
Merge commit '1d252e5ca01f07229c1462e2bf40575c0b814aca' into codex/resolve-7998-parent
# Conflicts: # .claude/rules/emcn-components.md # .cursor/rules/emcn-components.mdc # packages/emcn/src/components/button/button.tsx
2 parents 380bf5d + 1d252e5 commit 63aa37e

3 files changed

Lines changed: 4 additions & 11 deletions

File tree

‎apps/sim/app/workspace/[workspaceId]/logs/components/log-details/components/file-download/file-download.tsx‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,7 @@ function FileCard({ file, isExecutionFile = false, workspaceId }: FileCardProps)
106106
{file.type}
107107
{file.version === undefined ? '' : ` · v${file.version}`}
108108
</span>
109-
<Button
110-
variant='ghost'
111-
className='h-[20px]! px-1.5! py-0! text-xs'
112-
onClick={handleDownload}
113-
>
109+
<Button variant='ghost' size='inline' onClick={handleDownload}>
114110
<Download className='mr-1 size-[10px]' />
115111
Download
116112
</Button>

‎apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/table-primitives.tsx‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,8 @@ export const AddRowButton = React.memo(function AddRowButton({
7272
<Button
7373
type='button'
7474
variant='ghost'
75-
size='sm'
76-
className={cn(
77-
'h-[20px] gap-2 p-0 text-[var(--text-body)]',
78-
blockedReason && 'cursor-not-allowed opacity-50'
79-
)}
75+
size='inline'
76+
className={cn('gap-2', blockedReason && 'cursor-not-allowed opacity-50')}
8077
aria-disabled={blockedReason ? true : undefined}
8178
onClick={blockedReason ? undefined : onClick}
8279
>

‎packages/emcn/src/components/button/button.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ const responsiveIconSizes = {
8888
regular: 'sm:size-7',
8989
roomy: 'sm:size-8',
9090
touch: 'sm:size-10',
91-
} satisfies Record<ButtonIconSize, string>
91+
} as const satisfies Record<ButtonIconSize, string>
9292

9393
export interface ButtonProps
9494
extends ButtonHTMLAttributes<HTMLButtonElement>,

0 commit comments

Comments
 (0)