Skip to content

upgrade stories & events grid to grid2 #1792

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
merged 1 commit into from
Nov 5, 2024
Merged

upgrade stories & events grid to grid2 #1792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions frontends/main/src/app-pages/HomePage/NewsEventsSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
styled,
theme,
Typography,
Grid,
Grid2,
Card,
TypographyProps,
} from "ol-components"
Expand Down Expand Up @@ -286,19 +286,22 @@ const NewsEventsSection: React.FC = () => {
<Typography component="h3" variant="h4">
Stories
</Typography>
<Grid container columnSpacing="24px" rowSpacing="28px">
<Grid2 container columnSpacing="24px" rowSpacing="28px">
{stories.map((item, index) => (
<Grid item key={item.id} xs={12} sm={12} md={6} lg={4} xl={4}>
<Grid2
key={item.id}
size={{ xs: 12, sm: 12, md: 6, lg: 4, xl: 4 }}
>
{index >= 4 ? (
<AboveLgOnly>
<Story item={item as NewsFeedItem} mobile={false} />
</AboveLgOnly>
) : (
<Story item={item as NewsFeedItem} mobile={false} />
)}
</Grid>
</Grid2>
))}
</Grid>
</Grid2>
</StoriesContainer>
<EventsContainer>
<Typography component="h3" variant="h4">
Expand Down
2 changes: 2 additions & 0 deletions frontends/ol-components/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ export type { DrawerProps } from "@mui/material/Drawer"

export { default as Grid } from "@mui/material/Grid"
export type { GridProps } from "@mui/material/Grid"
export { default as Grid2 } from "@mui/material/Grid2"
export type { Grid2Props } from "@mui/material/Grid2"
export { default as InputLabel } from "@mui/material/InputLabel"

export { default as List } from "@mui/material/List"
Expand Down
Loading