Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # src/app/(main)/teams/[teamId]/TeamSettings.tsx
2025-09-19 18:01:42 -07:00
parent 7effa16f00 c66553c023
commit d8075764e2
3 changed files with 5 additions and 2 deletions
--- a/src/app/(main)/teams/[teamId]/TeamMembersTable.tsx
+++ b/src/app/(main)/teams/[teamId]/TeamMembersTable.tsx
@@ -38,7 +38,7 @@ export function TeamMembersTable({
            }

            return (
-              <Row alignItems="center">
+              <Row alignItems="center" maxHeight="20px">
                <TeamMemberEditButton teamId={teamId} userId={row?.user?.id} role={row?.role} />
                <TeamMemberRemoveButton
                  teamId={teamId}