Skip to content

Fix labs front containers for pageskins #15077

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
cemms1 merged 2 commits into from
Jan 5, 2026
Merged

Fix labs front containers for pageskins #15077

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
501c815
fix labs front containers for pageskins
cemms1 Jan 5, 2026
31e1ccc
small fixes
cemms1 Jan 5, 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: 10 additions & 1 deletion dotcom-rendering/src/components/FrontSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,9 @@ const labsSectionHeaderStyles = css`
grid-row: headline;
grid-column: title;
margin-top: ${space[2]}px;
`;

const labsSectionHeaderStylesFromLeftCol = css`
${from.leftCol} {
grid-row: content;
grid-column: title;
Expand Down Expand Up @@ -698,11 +701,17 @@ export const FrontSection = ({
/>

{isLabs ? (
<div css={labsSectionHeaderStyles}>
<div
css={[
labsSectionHeaderStyles,
!hasPageSkin && labsSectionHeaderStylesFromLeftCol,
]}
>
<LabsSectionHeader
title={title}
url={url}
editionId={editionId}
hasPageSkin={hasPageSkin}
/>
</div>
) : (
Expand Down
17 changes: 17 additions & 0 deletions dotcom-rendering/src/components/LabsSectionHeader.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const meta = {
title: 'Container Title',
url: '/',
editionId: 'AU',
hasPageSkin: false,
},
render: (args) => (
<div
Expand Down Expand Up @@ -53,3 +54,19 @@ export const WithDetailsOpen: Story = {
);
},
};

export const WithPageSkin: Story = {
args: {
hasPageSkin: true,
},
render: (args) => (
<div
css={css`
margin: 20px auto 100px;
width: 600px;
`}
>
<LabsSectionHeader {...args} />
</div>
),
};
66 changes: 49 additions & 17 deletions dotcom-rendering/src/components/LabsSectionHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
space,
textSans14,
textSansBold15,
until,
} from '@guardian/source/foundations';
import {
Link,
Expand All @@ -26,6 +25,7 @@ type Props = {
url?: string;
/** The ID of the edition, used to construct the Labs front URL */
editionId: EditionId;
hasPageSkin: boolean;
};

const headerStyles = css`
Expand All @@ -36,6 +36,9 @@ const headerStyles = css`
display: flex;
flex-grow: 1;
flex-direction: row;
`;

const headerStylesFromLeftCol = css`
${from.leftCol} {
flex-direction: column;
}
Expand All @@ -47,15 +50,22 @@ const logoStyles = css`

const dividerStylesUntilLeftCol = css`
position: relative;
${until.leftCol} {
margin-right: ${space[4]}px;
margin-right: ${space[4]}px;
::after {
content: '';
position: absolute;
top: 0;
bottom: 0;
right: -${space[2]}px;
border-right: 1px solid ${schemePalette('--section-border')};
}
`;

const dividerStylesFromLeftCol = css`
${from.leftCol} {
margin-right: unset;
::after {
content: '';
position: absolute;
top: 0;
bottom: 0;
right: -${space[2]}px;
border-right: 1px solid ${schemePalette('--section-border')};
display: none;
}
}
`;
Expand All @@ -76,7 +86,9 @@ const labelAndAboutStyles = css`
display: flex;
flex-direction: row;
justify-content: space-between;
`;

const labelAndAboutStylesFromLeftCol = css`
${between.leftCol.and.wide} {
flex-direction: column;
}
Expand All @@ -90,15 +102,17 @@ const labelStyles = css`
const aboutStyles = css`
justify-self: end;
${textSans14}
`;

const aboutStylesFromLeftCol = css`
${between.leftCol.and.wide} {
margin-top: ${space[1]}px;
}
`;

const positionStyles = css`
const positionStyles = (hasPageSkin: boolean) => css`
Copy link
Contributor Author

@cemms1 cemms1 Jan 5, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the Details component does not accept arrays of Emotion CSS (SerializedStyles) for the positionStyles prop, so we need to use a function here instead of multiple conditional styles as we would normally do elsewhere

right: 0;
${from.leftCol} {
${!hasPageSkin && from.leftCol} {
left: 0;
right: auto;
}
Expand All @@ -113,9 +127,20 @@ const detailsStyles = css`
}
`;

export const LabsSectionHeader = ({ title, url, editionId }: Props) => (
<div css={headerStyles}>
<div css={[logoStyles, dividerStylesUntilLeftCol]}>
export const LabsSectionHeader = ({
title,
url,
editionId,
hasPageSkin,
}: Props) => (
<div css={[headerStyles, !hasPageSkin && headerStylesFromLeftCol]}>
<div
css={[
logoStyles,
dividerStylesUntilLeftCol,
!hasPageSkin && dividerStylesFromLeftCol,
]}
>
<Link
href={`https://www.theguardian.com/guardian-labs${getLabsUrlSuffix(
editionId,
Expand All @@ -126,13 +151,20 @@ export const LabsSectionHeader = ({ title, url, editionId }: Props) => (
</div>

<div css={textLayoutStyles}>
<div css={labelAndAboutStyles}>
<div
css={[
labelAndAboutStyles,
!hasPageSkin && labelAndAboutStylesFromLeftCol,
]}
>
<span css={labelStyles}>Paid content</span>
<div css={aboutStyles}>
<div
css={[aboutStyles, !hasPageSkin && aboutStylesFromLeftCol]}
>
<Details
label="About"
labelSize="xsmall"
positionStyles={positionStyles}
positionStyles={positionStyles(hasPageSkin)}
>
<div css={detailsStyles}>
<p>
Expand Down
Loading