Skip to content

Commit cc865b5

Browse files
committed
move wrapper styling to the MoreGalleries component
1 parent 26187af commit cc865b5

File tree

2 files changed

+64
-63
lines changed

2 files changed

+64
-63
lines changed

dotcom-rendering/src/components/FetchMoreGalleriesData.importable.tsx

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -150,18 +150,11 @@ export const FetchMoreGalleriesData = ({
150150
}
151151

152152
return (
153-
<div
154-
css={{
155-
backgroundColor: palette('--onward-background'),
156-
minHeight: 300,
157-
}}
158-
>
159-
<MoreGalleries
160-
absoluteServerTimes={absoluteServerTimes}
161-
trails={buildTrails(data.trails, 5, isAdFreeUser)}
162-
discussionApiUrl={discussionApiUrl}
163-
guardianBaseUrl={guardianBaseUrl}
164-
/>
165-
</div>
153+
<MoreGalleries
154+
absoluteServerTimes={absoluteServerTimes}
155+
trails={buildTrails(data.trails, 5, isAdFreeUser)}
156+
discussionApiUrl={discussionApiUrl}
157+
guardianBaseUrl={guardianBaseUrl}
158+
/>
166159
);
167160
};

dotcom-rendering/src/components/MoreGalleries.tsx

Lines changed: 58 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -122,57 +122,65 @@ export const MoreGalleries = (props: Props) => {
122122
if (!firstTrail) return null;
123123

124124
return (
125-
<section
126-
data-component="more-galleries"
127-
data-link="more-galleries"
128-
css={css`
129-
${grid.paddedContainer}
130-
background-color: ${palette('--onward-background')};
131-
padding-top: ${space[1]}px;
132-
133-
${from.tablet} {
134-
padding-top: 0;
135-
border-left: 1px solid ${palette('--onward-content-border')};
136-
border-right: 1px solid
137-
${palette('--onward-content-border')};
138-
}
139-
`}
125+
<div
126+
css={{
127+
backgroundColor: palette('--onward-background'),
128+
minHeight: 300,
129+
}}
140130
>
141-
<Title guardianBaseUrl={props.guardianBaseUrl} />
142-
<MoreGalleriesSplashCard
143-
defaultProps={getDefaultCardProps(
144-
firstTrail,
145-
props.absoluteServerTimes,
146-
props.discussionApiUrl,
147-
)}
148-
/>
149-
<StraightLines
150-
cssOverrides={[
151-
cardsContainerStyles,
152-
css`
153-
${until.tablet} {
154-
display: none;
155-
}
156-
`,
157-
]}
158-
count={1}
159-
color={palette('--onward-content-border')}
160-
/>
161-
<ul css={[cardsContainerStyles, standardCardsListStyles]}>
162-
{standardCards.map((trail) => (
163-
<li key={trail.url} css={standardCardStyles}>
164-
<Card
165-
{...getDefaultCardProps(
166-
trail,
167-
props.absoluteServerTimes,
168-
props.discussionApiUrl,
169-
)}
170-
mediaSize="medium"
171-
/>
172-
</li>
173-
))}
174-
</ul>
175-
</section>
131+
<section
132+
data-component="more-galleries"
133+
data-link="more-galleries"
134+
css={css`
135+
${grid.paddedContainer}
136+
background-color: ${palette('--onward-background')};
137+
padding-top: ${space[1]}px;
138+
139+
${from.tablet} {
140+
padding-top: 0;
141+
border-left: 1px solid
142+
${palette('--onward-content-border')};
143+
border-right: 1px solid
144+
${palette('--onward-content-border')};
145+
}
146+
`}
147+
>
148+
<Title guardianBaseUrl={props.guardianBaseUrl} />
149+
<MoreGalleriesSplashCard
150+
defaultProps={getDefaultCardProps(
151+
firstTrail,
152+
props.absoluteServerTimes,
153+
props.discussionApiUrl,
154+
)}
155+
/>
156+
<StraightLines
157+
cssOverrides={[
158+
cardsContainerStyles,
159+
css`
160+
${until.tablet} {
161+
display: none;
162+
}
163+
`,
164+
]}
165+
count={1}
166+
color={palette('--onward-content-border')}
167+
/>
168+
<ul css={[cardsContainerStyles, standardCardsListStyles]}>
169+
{standardCards.map((trail) => (
170+
<li key={trail.url} css={standardCardStyles}>
171+
<Card
172+
{...getDefaultCardProps(
173+
trail,
174+
props.absoluteServerTimes,
175+
props.discussionApiUrl,
176+
)}
177+
mediaSize="medium"
178+
/>
179+
</li>
180+
))}
181+
</ul>
182+
</section>
183+
</div>
176184
);
177185
};
178186

0 commit comments

Comments
 (0)