Skip to content
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

Merge dev into production #1785

Merged
merged 3 commits into from
Dec 6, 2023
Merged

Merge dev into production #1785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4d5cc1
Add starknet newsletter home button
nuno-aac Dec 5, 2023
74c06c0
Merge branch 'dev' into feature/add-homepage-newsletter-subscribe
rafaelcruzazevedo Dec 6, 2023
5baac00
Merge pull request #1784 from starknet-io/feature/add-homepage-newsle…
rafaelcruzazevedo Dec 6, 2023
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
15 changes: 3 additions & 12 deletions _data/pages/home.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,6 @@ blocks:
- type: group
blocks:
- type: home_hero
- size: large
color: orange
variant: community_card
orientation: left
withIllustration: false
title: Community led.
type: image_icon_link_card
link:
custom_title: Get involved.
page: 683db5f6-c625-4fe0-a2af-3c5b6af8c2c9
description: This website is a community powered guide to the Starknet ecosystem.
columns: "4"
- type: group
blocks:
- size: large
Expand Down Expand Up @@ -51,6 +39,9 @@ blocks:
operates as a Validity-rollup (or ZK-rollup): it "bundles" many
transactions and "rolls" them to Ethereum as a single transaction.'
columns: "4"
- type: newsletter_popup
title: Starknet newsletter
description: "Sign up to receive the latest news and updates from Starknet. "
- type: flex_layout
heading_variant: h3
base: 1
Expand Down
6 changes: 6 additions & 0 deletions public/assets/cards/newsletter.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion workspaces/website/src/components/Card/ImageIconCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ type Props = {
title: string;
link?: LinkData;
icon?: string;
defaultIcon?: string;
description?: string;
locale: string,
size?: "large" | "small",
Expand All @@ -46,6 +47,7 @@ type descriptionVariantType = "body" | "cardBody" | "breadcrumbs" | "footerLink"

export const ImageIconCard = ({
title,
defaultIcon = "/assets/cards/user-group.svg",
description,
link,
icon,
Expand Down Expand Up @@ -131,7 +133,7 @@ export const ImageIconCard = ({
alignItems={{ lg: variant === "large_card" ? "center" : "initial" }}
height="100%"
>
<ImageIconBox title={title} variant={variant} color={color} size={size} icon={variant === "community_card" ? "/assets/cards/user-group.svg" : icon} withIllustration={withIllustration} />
<ImageIconBox title={title} variant={variant} color={color} size={size} icon={variant === "community_card" ? defaultIcon : icon} withIllustration={withIllustration} />
<Box
padding={{
base: variant === "community_card" ? "24px 32px 0 0" : (size === "large" && icon && variant === "image_icon_link_card") ?
Expand Down
1 change: 1 addition & 0 deletions workspaces/website/src/components/Card/NewsletterCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export const NewsletterCard = ({

<ImageIconCard
columns={4}
defaultIcon={'/assets/cards/newsletter.svg'}
description={description}
onClick={() => setIsOpen(true)}
orientation={'left'}
Expand Down