Skip to content

Commit f308a24

Browse files
committed
Merge branch 'source' into new-conf-design--speakers
2 parents 84ab9f6 + f192c30 commit f308a24

36 files changed

+314
-1302
lines changed

src/app/conf/2025/components/call-for-proposals.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ export function CallForProposals() {
382382
>
383383
{tabsInOrder.map((tab, i) => (
384384
<TabButton
385+
key={tab}
385386
tab={tab}
386387
tabIndex={i === 0 ? 0 : -1}
387388
activeTab={activeTab}
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
import { StripesDecoration } from "@/app/conf/_design-system/stripes-decoration"
2+
3+
import logoMask from "./logo-mask.webp"
4+
5+
export interface CtaCardSectionProps extends React.HTMLAttributes<HTMLElement> {
6+
title: string
7+
description: string
8+
children: React.ReactNode
9+
}
10+
11+
export function CtaCardSection({
12+
className,
13+
title: heading,
14+
description,
15+
children,
16+
...rest
17+
}: CtaCardSectionProps) {
18+
return (
19+
<div className="gql-conf-section">
20+
<section
21+
className="relative overflow-hidden bg-gradient-to-r from-pri-dark to-pri-base p-6 dark:from-pri-darker dark:to-pri-dark sm:p-16"
22+
{...rest}
23+
>
24+
<div className="relative z-10 flex flex-col gap-10 sm:items-start [@media(max-width:420px)]:text-center">
25+
<div className="flex flex-col gap-6">
26+
<h2 className="text-neu-0 typography-d1 dark:text-neu-900">
27+
{heading}
28+
</h2>
29+
<p className="max-w-[555px] text-pretty text-neu-50 typography-body-lg dark:text-neu-800">
30+
{description}
31+
</p>
32+
</div>
33+
34+
{children}
35+
</div>
36+
37+
<div
38+
role="presentation"
39+
// prettier-ignore
40+
className="
41+
pointer-events-none absolute
42+
sm:bottom-[-277px] inset-0 sm:left-1/3 xl:left-1/2 sm:top-[-107px] xl:right-[-391px]
43+
[--start:hsl(var(--color-sec-base))]
44+
[--end:hsl(var(--color-sec-lighter))]
45+
dark:[--start:hsl(var(--color-sec-dark))]
46+
dark:[--end:hsl(var(--color-sec-base))]
47+
48+
[mask-size:cover]
49+
max-sm:[mask-position:center] max-sm:opacity-50
50+
sm:[mask-size:1117px]
51+
"
52+
style={{
53+
maskImage: `url(${logoMask.src})`,
54+
maskRepeat: "no-repeat",
55+
}}
56+
>
57+
<StripesDecoration
58+
thin
59+
oddClassName="bg-[linear-gradient(180deg,var(--start)_0%,var(--end)_100%)]"
60+
/>
61+
</div>
62+
</section>
63+
</div>
64+
)
65+
}
Binary file not shown.

src/app/conf/2025/components/footer/index.tsx

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ export function Footer({
2323
return (
2424
<footer className="gql-all-anchors-focusable relative !bg-neu-100 text-neu-900 typography-menu dark:!bg-neu-0 max-md:px-0 max-md:pt-0">
2525
<Stripes />
26-
<div className="flex flex-wrap justify-between gap-4 px-6 py-4 max-md:w-full lg:py-10">
26+
<div className="flex flex-wrap justify-between gap-4 p-4 max-md:w-full md:px-6 lg:py-10 2xl:px-10">
2727
{logo}
28-
<div className="flex gap-x-4 gap-y-2 typography-body-lg">
29-
<p className="flex items-center gap-2">
28+
<div className="flex gap-x-4 typography-body-lg max-sm:grid max-sm:grid-cols-2 max-sm:items-start max-sm:text-lg sm:gap-y-2">
29+
<p className="flex items-center whitespace-pre">
3030
<time dateTime="2025-09-08">September 08</time>
3131
<span>-</span>
32-
<time dateTime="2025-09-10">10, 2025</time>
32+
<time dateTime="2025-09-10">
33+
10<span className="max-sm:hidden">, 2025</span>
34+
</time>
3335
</p>
3436
<address className="not-italic">Amsterdam, Netherlands</address>
3537
</div>
@@ -41,7 +43,7 @@ export function Footer({
4143
</li>
4244
))}
4345
</ul>
44-
<div className="relative flex justify-between gap-10 px-6 py-4 text-sm max-lg:flex-col">
46+
<div className="relative flex justify-between gap-10 p-4 text-sm max-lg:flex-col md:px-6 2xl:px-10">
4547
<div className="flex flex-col font-light max-md:gap-5">
4648
<p>
4749
Copyright © {new Date().getFullYear()} The GraphQL Foundation. All
@@ -139,7 +141,7 @@ function FooterBox({ box }: { box: FooterLink | FooterLink[] }) {
139141
href={href}
140142
title={disabled ? "Coming soon" : undefined}
141143
className={clsx(
142-
"gql-focus-visible relative block h-full p-6",
144+
"gql-focus-visible relative block h-full p-4 pb-8 md:p-6 2xl:px-10",
143145
disabled ? "pointer-events-none" : "underline-offset-4 hover:underline",
144146
)}
145147
tabIndex={disabled ? -1 : undefined}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)