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 2 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
2 commits
Select commit Hold shift + click to select a range
9b7a8b8
Absorb PictureLayout into grid
frederickobrien Jun 23, 2026
53aad3f
Handle author/artist avatars
frederickobrien Jun 28, 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
13 changes: 9 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 @@ -874,10 +874,15 @@ export const ArticleHeadline = ({
case ArticleDesign.Picture:
return (
<div
css={decideBottomPadding({
format,
hasAvatar,
})}
css={[
decideBottomPadding({
format,
hasAvatar,
}),
css`
max-width: 620px;
`,
]}
>
<DesignTag format={format} />
<h1
Expand Down
28 changes: 15 additions & 13 deletions dotcom-rendering/src/components/DecideLines.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,20 @@ const DottedLines = ({
export const DecideLines = ({ format, color }: Props) => {
const count = format.design === ArticleDesign.Comment ? 8 : 4;

switch (format.theme) {
case Pillar.Sport:
return <DottedLines count={count} color={color} />;
default:
return (
<StraightLines
cssOverrides={css`
display: block;
`}
count={count}
color={color}
/>
);
if (
format.theme === Pillar.Sport &&
format.design !== ArticleDesign.Picture
) {
return <DottedLines count={count} color={color} />;
}

return (
<StraightLines
cssOverrides={css`
display: block;
`}
count={count}
color={color}
/>
);
};
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 @@ -75,6 +75,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 @@ -14,7 +14,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 @@ -91,15 +90,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 @@ -273,16 +263,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