Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

💄 Lead the support card with the button and drop its separator (#3320)

Luke Vellaf5b43df65408
diff --git a/apps/web/src/app/[locale]/(space)/settings/billing/components/billing-details-card.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/components/billing-details-card.tsx
index 012547ab5..e0db3ad35 100644
--- a/apps/web/src/app/[locale]/(space)/settings/billing/components/billing-details-card.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/billing/components/billing-details-card.tsx
@@ -42,8 +42,9 @@ export function BillingDetailsCard({ className }: { className?: string }) {
</PlanCardDescription>
</PlanCardContent>
</PlanCardHeader>
- <PlanCardFooter className="flex-row items-center justify-end">
+ <PlanCardFooter className="flex-row items-center">
<Button
+ className="ml-auto"
loading={openBillingDetails.isExecuting}
onClick={() => openBillingDetails.execute()}
>
diff --git a/apps/web/src/app/[locale]/(space)/settings/billing/components/payment-methods-card.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/components/payment-methods-card.tsx
index 8b0eb9e91..0e1fdb39c 100644
--- a/apps/web/src/app/[locale]/(space)/settings/billing/components/payment-methods-card.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/billing/components/payment-methods-card.tsx
@@ -101,8 +101,9 @@ export function PaymentMethodsCard({
)}
</PlanCardContent>
</PlanCardHeader>
- <PlanCardFooter className="flex-row items-center justify-end">
+ <PlanCardFooter className="flex-row items-center">
<Button
+ className="ml-auto"
loading={openBillingDetails.isExecuting}
onClick={() => openBillingDetails.execute()}
>
diff --git a/apps/web/src/app/[locale]/(space)/settings/billing/components/plan-card.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/components/plan-card.tsx
index c63bc8681..fca283817 100644
--- a/apps/web/src/app/[locale]/(space)/settings/billing/components/plan-card.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/billing/components/plan-card.tsx
@@ -38,7 +38,7 @@ export function PlanCardHeader({
return (
<div
className={cn(
- "flex @sm:flex-row flex-col @sm:items-center justify-between gap-4 p-4",
+ "flex @sm:flex-row flex-col @sm:items-center gap-4 p-4",
className,
)}
{...props}
@@ -83,7 +83,10 @@ export function PlanCardActions({
}: React.ComponentProps<"div">) {
return (
<div
- className={cn("flex shrink-0 flex-wrap items-center gap-2", className)}
+ className={cn(
+ "@sm:ml-auto flex shrink-0 flex-wrap items-center gap-2",
+ className,
+ )}
{...props}
/>
);
@@ -99,7 +102,7 @@ export function PlanCardFooter({
// Inset rule rather than a full width border, so the footer reads as
// part of the card rather than a separate band. mt-auto pins it to the
// bottom when paired cards have unequal content heights.
- "mx-4 mt-auto flex @sm:flex-row flex-col @sm:items-center justify-between gap-2 border-card-border border-t pt-3 pb-4 text-muted-foreground text-sm",
+ "mx-4 mt-auto flex @sm:flex-row flex-col @sm:items-center gap-2 border-card-border border-t pt-3 pb-4 text-muted-foreground text-sm @sm:[&>*:last-child]:ml-auto",
className,
)}
{...props}
diff --git a/apps/web/src/app/[locale]/(space)/settings/billing/components/support-card.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/components/support-card.tsx
index d44069fd1..f40032450 100644
--- a/apps/web/src/app/[locale]/(space)/settings/billing/components/support-card.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/billing/components/support-card.tsx
@@ -6,8 +6,6 @@ import { SendIcon } from "lucide-react";
import { Trans } from "@/i18n/client";
import {
PlanCard,
- PlanCardDescription,
- PlanCardFooter,
PlanCardHeading,
PlanCardHeadingDescription,
PlanCardHeadingTitle,
@@ -27,8 +25,18 @@ export function SupportCard({ className }: { className?: string }) {
/>
</PlanCardHeadingDescription>
</PlanCardHeading>
- <PlanCardFooter>
- <PlanCardDescription>
+ <div className="flex flex-wrap items-center gap-x-4 gap-y-2 px-4 pt-3 pb-4">
+ <a
+ href="mailto:[email protected]"
+ className={buttonVariants()}
+ onClick={() => {
+ posthog?.capture("space_billing:support_button_click");
+ }}
+ >
+ <SendIcon className="text-muted-foreground" />
+ <Trans i18nKey="contactSupport" defaults="Contact support" />
+ </a>
+ <p className="text-muted-foreground text-sm">
<Trans
i18nKey="contactSupportEmail"
defaults="Or email us at <0>[email protected]</0>"
@@ -40,18 +48,8 @@ export function SupportCard({ className }: { className?: string }) {
/>,
]}
/>
- </PlanCardDescription>
- <a
- href="mailto:[email protected]"
- className={buttonVariants()}
- onClick={() => {
- posthog?.capture("space_billing:support_button_click");
- }}
- >
- <SendIcon className="text-muted-foreground" />
- <Trans i18nKey="contactSupport" defaults="Contact support" />
- </a>
- </PlanCardFooter>
+ </p>
+ </div>
</PlanCard>
);
}