Skip to content

Back merge staging into dev #15666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wackerow merged 6 commits into from
Jun 13, 2025
Merged

Back merge staging into dev #15666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a2bce5
Merge pull request #15658 from ethereum/dev
corwintines Jun 12, 2025
01c65a4
fix: string formatting
wackerow Jun 12, 2025
5af5ed0
fix italy's
corwintines Jun 12, 2025
7a516b3
Merge pull request #15661 from ethereum/patch-data-string
corwintines Jun 12, 2025
3f8a166
fix: use next/image
wackerow Jun 13, 2025
2ac5f68
Merge pull request #15665 from ethereum/10y-image
corwintines Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions app/[locale]/10years/_components/TenYearHomeBanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { getTranslations } from "next-intl/server"

import { Image } from "@/components/Image"
import ParallaxImage from "@/components/Image/ParallaxImage"
import { ButtonLink } from "@/components/ui/buttons/Button"

import Countdown from "./CountDown"
import { getTimeUnitTranslations } from "./utils"

import TenYearBackgroundImage from "@/public/images/10-year-anniversary/10-year-background.png"
import TenYearGraphicImage from "@/public/images/10-year-anniversary/10-year-logo.png"
import TenYearDesktopText from "@/public/images/10-year-anniversary/10yeartext.svg"
import TenYearMobileText from "@/public/images/10-year-anniversary/10yeartext-mobile.svg"
Expand All @@ -19,8 +21,16 @@ const TenYearHomeBanner = async ({ locale }: { locale: string }) => {
const timeLeftLabels = await getTimeUnitTranslations(locale)

return (
<div className="relative rounded-2xl bg-[url('/images/10-year-anniversary/10-year-background.png')] bg-cover bg-center text-center">
<div className="absolute h-full w-full rounded-2xl bg-ten-year-gradient opacity-80" />
<div className="relative rounded-2xl bg-cover bg-center text-center">
<div className="absolute inset-0 overflow-hidden rounded-2xl after:absolute after:inset-0 after:bg-ten-year-gradient after:opacity-80 after:content-['']">
<Image
src={TenYearBackgroundImage}
alt=""
sizes="(max-width: 1504px) 100vw, 1504px"
quality={15}
className="size-full"
/>
</div>
<div className="relative rounded-2xl p-8">
<ParallaxImage
src={TenYearGraphicImage}
Expand Down
4 changes: 2 additions & 2 deletions src/data/community-events.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"endDate": "2025-06-25",
"href": "https://nft.nyc",
"location": "NYC, USA",
"description": "&quot;The Super Bowl of NFTs&quot; - Register now for NFT.NYC's 8th annual event. 50,000+ Alumni, the leading speakers and the best projects in the NFT ecosystem.",
"description": "'The Super Bowl of NFTs' - Register now for NFT.NYC's 8th annual event. 50,000+ Alumni, the leading speakers and the best projects in the NFT ecosystem.",
"imageUrl": "https://www.nft.nyc/hubfs/nftnyc2021-eventbrite-header.png"
},
{
Expand Down Expand Up @@ -248,7 +248,7 @@
"endDate": "2025-06-24",
"href": "https://ethmilan.xyz",
"location": "Milan, ITALY",
"description": "ETHMilan 2025 – Italy&#x27;s Largest ETH & Web3 Conference",
"description": "ETHMilan 2025 – Italy's Largest ETH & Web3 Conference",
"imageUrl": "https://cdn.prod.website-files.com/677e49dfe7df51bec6e5ba71/67b58ffe31d5fe8d4e54880e__DSC0914.jpeg"
},
{
Expand Down
Loading