Skip to content

WIP Remove isFrontContainer check from FrontSection #15601

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

Draft
domlander wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP Remove isFrontContainer check from FrontSection #15601

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 8 additions & 28 deletions dotcom-rendering/src/components/FrontSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,15 +463,7 @@ const sideBorders = css`
}
`;

const topBorder = css`
border-top-style: solid;
`;

const bottomPadding = css`
padding-bottom: ${space[9]}px;
`;

const bottomPaddingFrontContainer = (
const bottomPadding = (
useLargeSpacingMobile: boolean,
useLargeSpacingDesktop: boolean,
) => css`
Expand Down Expand Up @@ -645,7 +637,6 @@ export const FrontSection = ({
}: Props) => {
const isToggleable = toggleable && !!sectionId;
const showVerticalRule = !hasPageSkin;
const isFrontContainer = containerLevel !== undefined;

const useLargeSpacingMobile = !!isNextCollectionPrimary || isAboveMobileAd;
const useLargeSpacingDesktop =
Expand Down Expand Up @@ -684,7 +675,7 @@ export const FrontSection = ({
),
}}
>
{isFrontContainer && showTopBorder && (
{showTopBorder && (
<div
css={[
containerLevel === 'Primary' &&
Expand All @@ -705,13 +696,7 @@ export const FrontSection = ({
/>
)}

<div
css={[
decoration,
sideBorders,
showTopBorder && !isFrontContainer && topBorder,
]}
/>
<div css={[decoration, sideBorders]} />

{isLabs ? (
<div
Expand All @@ -737,7 +722,6 @@ export const FrontSection = ({
title?.toLowerCase() === 'opinion',
),
showVerticalRule &&
!isFrontContainer &&
sectionHeadlineFromLeftCol(
schemePalette('--section-border'),
),
Expand Down Expand Up @@ -800,9 +784,7 @@ export const FrontSection = ({
sectionContentHorizontalMargins,
sectionContentRow(toggleable),
topPadding,
showVerticalRule &&
isFrontContainer &&
sectionContentBorderFromLeftCol,
showVerticalRule && sectionContentBorderFromLeftCol,
slimifySectionForSlimHomepageAbTest &&
slimHomepageRightBorderStyles,
]}
Expand Down Expand Up @@ -856,12 +838,10 @@ export const FrontSection = ({
sectionBottomContent,
slimifySectionForSlimHomepageAbTest &&
slimSectionBottomContent,
isFrontContainer
? bottomPaddingFrontContainer(
useLargeSpacingMobile,
useLargeSpacingDesktop,
)
: bottomPadding,
bottomPadding(
useLargeSpacingMobile,
useLargeSpacingDesktop,
),
]}
>
{isString(targetedTerritory) &&
Expand Down
Loading