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.

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

Container query feature branch #1630

Open
wants to merge 26 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
91457f2
featured content container query testing
jackiequach Apr 24, 2024
fd54230
Swaps out media queries for container queries
oliviawongnyc May 2, 2024
8fd860c
updates based on feedback
jackiequach May 7, 2024
f6e1398
update card to use container queries
jackiequach May 30, 2024
937b45b
Merge branch 'development' into DSD-1719/searchbar-with-container-que…
oliviawongnyc Jun 12, 2024
58954dd
Merge branch 'development' into no-ref/container-query-testing
oliviawongnyc Jun 12, 2024
2ce01f5
Merge branch 'development' into DSD-1719/card-with-container-queries
oliviawongnyc Jun 12, 2024
964073f
Merge branch 'no-ref/container-query-testing' into container-query-fe…
oliviawongnyc Jun 12, 2024
b91ae87
Merge branch 'DSD-1719/searchbar-with-container-queries' into contain…
oliviawongnyc Jun 12, 2024
e3aac77
add styles for card image
jackiequach Jun 20, 2024
08d24c4
Updates for searchbar button
oliviawongnyc Jun 26, 2024
69c8594
Merge branch 'DSD-1719/card-with-container-queries' of https://github…
oliviawongnyc Jun 26, 2024
3d3e003
Merge branch 'DSD-1719/card-with-container-queries' into container-qu…
oliviawongnyc Jun 26, 2024
cb3f12b
Merge branch 'development' into container-query-feature-branch
oliviawongnyc Jun 26, 2024
eb8acda
Updates version
oliviawongnyc Jun 26, 2024
2c82d5b
update snapshots
jackiequach Sep 25, 2024
e491fe1
Merge branch 'development' into container-query-feature-branch
jackiequach Sep 25, 2024
84956eb
update package-lock.json
jackiequach Sep 30, 2024
063d994
Merge branch 'development' into container-query-feature-branch
jackiequach Oct 10, 2024
a486025
fix package-lock
jackiequach Oct 10, 2024
467448f
Merge branch 'development' into container-query-feature-branch
jackiequach Jan 24, 2025
cce3519
update changelogs
jackiequach Jan 24, 2025
d87a1c7
fix issues with card on welcome page
jackiequach Jan 28, 2025
1ddd565
update snapshots
jackiequach Jan 28, 2025
81e9f23
address some comments and update styles from merging
jackiequach Jan 30, 2025
dceeba3
update snapshots
jackiequach Jan 30, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Currently, this repo is in Prerelease. When it is released, this project will ad
- Updates the `Heading` component to add `line-height` styles for mobile.
- Updates the `Breadcrumbs` component to make link text screen readable on mobile breakpoints.
- Updates the `MultiSelect` component to adjust the text and size styles for the search input field.
- Updates the `Card`, `FeaturedContent`, and `SearchBar` components to use container queries.

## 3.5.2 (January 16, 2025)

Expand Down
80 changes: 40 additions & 40 deletions src/components/Card/Card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function CardImage(
});

return (
<Box __css={styles}>
<Box __css={styles} data-image>
<Image
alt={alt}
aspectRatio={aspectRatio}
Expand Down Expand Up @@ -266,6 +266,7 @@ export const Card: ChakraComponent<
isCentered,
layout,
mainActionLink,
imageSize: imageProps.size,
});

React.Children.map(
Expand Down Expand Up @@ -320,46 +321,45 @@ export const Card: ChakraComponent<
);

return (
<CardWrapper
id={id}
className={className}
mainActionLink={mainActionLink}
ref={ref}
styles={{
...styles.base,
...customColors,
}}
{...rest}
>
{hasImage && (
<CardImage
alt={imageProps.alt}
aspectRatio={finalImageAspectRatio}
caption={imageProps.caption}
component={imageProps.component}
credit={imageProps.credit}
fallbackSrc={imageProps.fallbackSrc}
id={imageProps.id}
isAtEnd={imageProps.isAtEnd}
isLazy={imageProps.isLazy}
onError={imageProps.onError}
layout={layout}
size={imageProps.size}
src={imageProps.src ? imageProps.src : undefined}
/>
)}
<Box className="card-body" __css={styles.body}>
{cardContents}
</Box>
{cardRightContents.length ? (
<Box
className="card-right"
__css={{ ...styles.body, ...styles.actions }}
>
{cardRightContents}
<Box __css={styles.base} ref={ref}>
<CardWrapper
id={id}
className={className}
mainActionLink={mainActionLink}
styles={{
...styles.wrapper,
...customColors,
}}
data-wrapper
{...rest}
>
{hasImage && (
<CardImage
alt={imageProps.alt}
aspectRatio={finalImageAspectRatio}
caption={imageProps.caption}
component={imageProps.component}
credit={imageProps.credit}
fallbackSrc={imageProps.fallbackSrc}
id={imageProps.id}
isAtEnd={imageProps.isAtEnd}
isLazy={imageProps.isLazy}
onError={imageProps.onError}
layout={layout}
size={imageProps.size}
src={imageProps.src ? imageProps.src : undefined}
/>
)}
<Box __css={styles.body} data-body>
{cardContents}
</Box>
) : null}
</CardWrapper>
{cardRightContents.length ? (
<Box __css={{ ...styles.body, ...styles.actions }} data-actions>
{cardRightContents}
</Box>
) : null}
</CardWrapper>
</Box>
);
}
)
Expand Down
Loading