Skip to content

Commit 9c58bae

Browse files
committed
change footer style to be smaller and grey
1 parent 7c982a8 commit 9c58bae

File tree

5 files changed

+23
-13
lines changed

5 files changed

+23
-13
lines changed

components/donate/DonateCheckout.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import ArrowLeftIcon from "../../public/ui/arrow-left.svg?inline"
99

1010
import { Button } from "../Button"
1111
import { Input } from "../Input"
12-
import { DonateFooter } from "./DonateFooter"
1312

1413
interface DonateCheckoutProps {
1514
backUrl?: string
@@ -174,7 +173,6 @@ export function DonateCheckout({
174173
)}
175174
</Button>
176175
</div>
177-
<DonateFooter />
178176
</form>
179177
)
180178
}

components/donate/DonateFooter.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import LogoPurple from "../../public/logos/logo-purple.svg?inline"
44

55
export function DonateFooter() {
66
return (
7-
<footer className="flex gap-2 items-center mt-3 text-b3">
8-
<LogoPurple className="size-8" />
7+
<footer className="flex gap-2 items-center mt-3 text-b4 bg-gray-3 px-8 py-2">
8+
<LogoPurple className="size-6" />
99
<FormattedMessage
1010
id="donate_widget.footer"
1111
defaultMessage="Donations go to Mastodon gGmbH"

components/donate/DonateWidget.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import type {
1616
} from "../../types/api"
1717
import { Button } from "../Button"
1818
import { Input } from "../Input"
19-
import { DonateFooter } from "./DonateFooter"
2019

2120
export type OnDonateFn = (
2221
amount: number,
@@ -239,8 +238,6 @@ export function DonateWidget({
239238
? intl.formatMessage(messages.loadingCheckout)
240239
: donation_button_text}
241240
</Button>
242-
243-
<DonateFooter />
244241
</div>
245242
)
246243
}

pages/donate/checkout.tsx

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { sendMessage } from "../../donate/utils"
1111
import { CURRENCIES, DONATION_FREQUENCIES } from "../../types/api"
1212

1313
import { themeSchema } from "../../donate/utils"
14+
import { DonateFooter } from "../../components/donate/DonateFooter"
1415

1516
const primaryColor = "#6364ff"
1617
const hoverColor = "#563acc"
@@ -79,11 +80,19 @@ export default function DonateCheckoutPage({
7980
},
8081
}}
8182
>
82-
<DonateCheckout
83-
onComplete={handleDonate}
84-
className={classNames(theme, "bg-white dark:bg-black p-8")}
85-
backUrl={backUrl}
86-
/>
83+
<div
84+
className={classNames(
85+
theme,
86+
"bg-white dark:bg-black min-h-screen flex flex-col"
87+
)}
88+
>
89+
<DonateCheckout
90+
onComplete={handleDonate}
91+
className="p-8 pb-2 grow"
92+
backUrl={backUrl}
93+
/>
94+
<DonateFooter />
95+
</div>
8796
</CheckoutProvider>
8897
)
8998
}

pages/donate/index.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
DONATION_FREQUENCIES,
1414
} from "../../types/api"
1515
import { fetchEndpoint } from "../../utils/api"
16+
import { DonateFooter } from "../../components/donate/DonateFooter"
1617

1718
export default function DonatePage({
1819
theme,
@@ -45,16 +46,21 @@ export default function DonatePage({
4546

4647
return (
4748
<div
48-
className={classNames(theme, "bg-white dark:bg-black min-h-screen p-8")}
49+
className={classNames(
50+
theme,
51+
"bg-white dark:bg-black min-h-screen flex flex-col"
52+
)}
4953
>
5054
<DonateWidget
5155
defaultCurrency={defaultCurrency ?? default_currency}
56+
className="p-8 pb-2 grow"
5257
messages={{ donation_message, donation_button_text }}
5358
amounts={amounts}
5459
onDonate={handleDonate}
5560
defaultAmount={defaultAmount}
5661
defaultFrequency={defaultFrequency}
5762
/>
63+
<DonateFooter />
5864
</div>
5965
)
6066
}

0 commit comments

Comments
 (0)