Skip to content

Move PictureLayout to grid #16251

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

Open
frederickobrien wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Move PictureLayout to grid #16251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b5d5b77
Absorb PictureLayout into grid
frederickobrien Jun 23, 2026
c1b8e73
Handle author/artist avatars
frederickobrien Jun 28, 2026
823ac99
Update dotcom-rendering/src/layouts/lib/articleArrangements.ts
frederickobrien Jul 22, 2026
69c116f
Update dotcom-rendering/src/layouts/lib/articleArrangements.ts
frederickobrien Jul 22, 2026
298c2fe
Update dotcom-rendering/src/layouts/lib/articleArrangements.ts
frederickobrien Jul 22, 2026
c630ac6
Properly nest headline elements
frederickobrien Jul 28, 2026
a9b904f
Tidying
frederickobrien Jul 28, 2026
cc995bc
Use switch to decide grid arrangement
frederickobrien Jul 29, 2026
bb875ae
Rebase tidying
frederickobrien Aug 19, 2026
10464b0
Fine tuning
frederickobrien Aug 19, 2026
7ba6108
Merge branch 'main' into move-picture-layout-into-grid
frederickobrien Aug 27, 2026
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
11 changes: 7 additions & 4 deletions dotcom-rendering/src/components/ArticleHeadline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,10 +966,13 @@ export const ArticleHeadline = ({
case ArticleDesign.Picture:
return (
<div
css={decideBottomPadding({
format,
hasAvatar,
})}
css={[
decideBottomPadding({
format,
hasAvatar,
}),
maxWidth,
]}
>
<DesignTag format={format} />
<h1
Expand Down
19 changes: 16 additions & 3 deletions dotcom-rendering/src/components/DecideLines.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
type Props = {
format: ArticleFormat;
color?: string;
displayingAvatar?: boolean;
};

type DottedLinesProps = { color?: string; count: number };
Expand Down Expand Up @@ -40,12 +41,24 @@ const DottedLines = ({
></div>
);

export const DecideLines = ({ format, color }: Props) => {
const count = format.design === ArticleDesign.Comment ? 8 : 4;
export const DecideLines = ({ format, color, displayingAvatar }: Props) => {
const count =
format.design === ArticleDesign.Comment || displayingAvatar ? 8 : 4;

switch (format.theme) {
case Pillar.Sport:
return <DottedLines count={count} color={color} />;
if (format.design !== ArticleDesign.Picture) {
return <DottedLines count={count} color={color} />;
}
return (
<StraightLines
cssOverrides={css`
display: block;
`}
count={count}
color={color}
/>
);
default:
return (
<StraightLines
Expand Down
7 changes: 7 additions & 0 deletions dotcom-rendering/src/components/MainMedia.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,13 @@ const chooseWrapper = (format: ArticleFormat) => {
return noGutters;
}
}
case ArticleDisplay.Showcase:
switch (format.design) {
case ArticleDesign.Picture:
return '';
default:
return noGutters;
}
default:
return noGutters;
}
Expand Down
20 changes: 0 additions & 20 deletions dotcom-rendering/src/layouts/DecideLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import { ImmersiveLayout } from './ImmersiveLayout';
import { InteractiveLayout } from './InteractiveLayout';
import { LiveLayout } from './LiveLayout';
import { NewsletterSignupLayout } from './NewsletterSignupLayout';
import { PictureLayout } from './PictureLayout';
import { StandardLayout } from './StandardLayout';

interface BaseProps {
Expand Down Expand Up @@ -101,15 +100,6 @@ const DecideLayoutApps = ({ article, renderingTarget }: AppProps) => {
serverTime={serverTime}
/>
);
case ArticleDesign.Picture:
return (
<PictureLayout
article={article.frontendData}
format={format}
renderingTarget={renderingTarget}
serverTime={serverTime}
/>
);
default:
return (
<StandardLayout
Expand Down Expand Up @@ -289,16 +279,6 @@ const DecideLayoutWeb = ({ article, NAV, renderingTarget }: WebProps) => {
serverTime={serverTime}
/>
);
case ArticleDesign.Picture:
return (
<PictureLayout
article={article.frontendData}
NAV={NAV}
format={format}
renderingTarget={renderingTarget}
serverTime={serverTime}
/>
);
default:
return (
<StandardLayout
Expand Down
Loading
Loading