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

chore(SLB-455): add subgrid to card layout #357

Open
wants to merge 7 commits into
base: release
Choose a base branch
from
Open

chore(SLB-455): add subgrid to card layout #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bd17287
chore(SLB-455): add subgrid to card layout
dan2k3k4 Oct 16, 2024
d876cba
chore: fix formatting...
dan2k3k4 Oct 16, 2024
b042663
chore(SLB-455): remove padding, gap, and offset from cards
dan2k3k4 Oct 24, 2024
03f5ccc
chore(SLB-455): set rounded on img directly
dan2k3k4 Oct 24, 2024
f176282
chore(SLB-455): try aspect-ratio 16 by 9 for images on cards
dan2k3k4 Oct 24, 2024
37a3418
chore: pnpm test:format:fix
dan2k3k4 Oct 25, 2024
cc22475
Merge branch 'release' into SLB-455-card-subgrid
dan2k3k4 Oct 30, 2024
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: 9 additions & 6 deletions packages/ui/src/components/Organisms/Card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ export const CardItem = ({
return (
<article
aria-labelledby={formattedID}
className="focus-within:outline focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-indigo-600 relative max-w-sm bg-white rounded-lg hover:shadow overflow-hidden flex flex-col-reverse"
className="focus-within:outline focus-within:outline-2 focus-within:outline-indigo-600 relative max-w-sm bg-white rounded-lg hover:shadow grid grid-rows-[auto_1fr]"
>
<div className="p-5">
<div className="p-5 grid grid-rows-[auto_1fr_auto] gap-4">
<h5
id={formattedID}
className="mb-2 text-2xl font-bold tracking-tight text-gray-900"
Expand All @@ -28,7 +28,7 @@ export const CardItem = ({
{hero?.headline ? <div>{hero?.headline}</div> : null}
<Link
href={path}
className="inline-flex items-center px-3 py-2 text-sm font-medium text-center text-blue-700 border border-blue-700 rounded-lg hover:bg-blue-800 hover:text-white focus:outline-offset-4 after:content-[''] after:absolute after:inset-0"
className="row-start-3 justify-self-start inline-flex items-center px-3 py-2 text-sm font-medium text-center text-blue-700 border border-blue-700 rounded-lg hover:bg-blue-800 hover:text-white focus:outline-offset-4 after:content-[''] after:absolute after:inset-0"
>
<span className="sr-only w-0 h-0 overflow-hidden">{title}</span>
{readMoreText ||
Expand All @@ -53,11 +53,14 @@ export const CardItem = ({
</svg>
</Link>
</div>
<div className="rounded-t-lg">
<div className="row-start-1">
{teaserImage ? (
<Image {...teaserImage} className="w-full" />
<Image
{...teaserImage}
className="w-full aspect-[16/9] rounded-t-lg"
/>
) : (
<div className="aspect-[4/3] bg-indigo-200" />
<div className="aspect-[16/9] rounded-t-lg bg-indigo-200" />
)}
</div>
</article>
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/components/Organisms/ContentHub.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ export function ContentHub({ pageSize = 10 }: { pageSize: number }) {
) : null}
{data?.contentHub.total ? (
<>
<ul className="my-8 grid md:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
<ul className="my-8 grid gap-4 lg:gap-8 md:grid-cols-2 lg:grid-cols-3 auto-rows-fr grid-rows-subgrid">
{data?.contentHub.items.filter(isTruthy).map((item) => {
return (
<li key={item.path}>
<li key={item.path} className="grid grid-rows-subgrid">
<CardItem {...item} />
</li>
);
Expand Down
9 changes: 6 additions & 3 deletions packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,14 @@ export function BlockTeaserList(props: BlockTeaserListFragment) {
return (
<div className="bg-white py-12 px-6 lg:px-8">
<div className="mx-auto max-w-6xl">
<ul className="my-8 grid md:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
<ul className="my-8 grid md:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8 grid-cols-subgrid">
{props.staticContent?.map((teaserItem) => {
staticIds.push(getUUIDFromId(teaserItem?.content?.id || ''));
return teaserItem?.content ? (
<li key={teaserItem?.content?.id}>
<li
key={teaserItem?.content?.id}
className="grid grid-rows-subgrid"
>
<CardItem
readMoreText={props.buttonText}
{...teaserItem?.content}
Expand Down Expand Up @@ -76,7 +79,7 @@ export function DynamicTeaserList(
<>
{data.teaserList.items.map((teaserItem) => {
return teaserItem ? (
<li key={teaserItem.id}>
<li key={teaserItem.id} className="grid grid-rows-subgrid">
<CardItem readMoreText={props.buttonText} {...teaserItem} />
</li>
) : null;
Expand Down
Loading