Rebase tidy

Author: frederickobrien

dotcom-rendering/src/layouts/StandardLayout.tsx

@@ -60,7 +60,6 @@ import type { ArticleDeprecated } from '../types/article';
 import type { RenderingTarget } from '../types/renderingTarget';
 import { type Area, gridCss, type LayoutType } from './lib/furnitureLayouts';
 import { BannerWrapper, Stuck } from './lib/stickiness';
-import { Grid } from 'src/components/Masthead/Titlepiece/Grid';
 
 const stretchLines = css`
 	${until.phablet} {
@@ -168,11 +167,7 @@ export const StandardLayout = (props: WebProps | AppProps) => {
 
 	const renderAds = canRenderAds(article);
 
-	const layoutType: LayoutType = isMatchReport
-		? 'matchReport'
-		: isMedia
-		? 'media'
-		: 'standard';
+	const layoutType: LayoutType = isMedia ? 'media' : 'standard';
 
 	return (
 		<>
@@ -245,12 +240,20 @@ export const StandardLayout = (props: WebProps | AppProps) => {
 					pageId={article.pageId}
 					pageTags={article.tags}
 				/>
-				<article css={css(grid.container)}>
-					<GridItem
-						area="main-media"
-						layoutType={layoutType}
-						element="div"
-					>
+				<article
+					css={css([
+						css`
+							background-color: ${themePalette(
+								'--article-background',
+							)};
+						`,
+						grid.container,
+						grid.verticalRules({
+							centre: isLabs ? false : true,
+						}),
+					])}
+				>
+					<GridItem area="main-media" layoutType={layoutType}>
 						<MainMedia
 							format={format}
 							elements={article.mainMediaElements}
@@ -283,11 +286,7 @@ export const StandardLayout = (props: WebProps | AppProps) => {
 							isMatch={!!footballMatchUrl}
 						/>
 					</GridItem>
-					<GridItem
-						area="headline"
-						layoutType={layoutType}
-						element="div"
-					>
+					<GridItem area="headline" layoutType={layoutType}>
 						<ArticleHeadline
 							format={format}
 							headlineString={article.headline}
@@ -299,11 +298,7 @@ export const StandardLayout = (props: WebProps | AppProps) => {
 							starRating={article.starRating}
 						/>
 					</GridItem>
-					<GridItem
-						area="standfirst"
-						layoutType={layoutType}
-						element="div"
-					>
+					<GridItem area="standfirst" layoutType={layoutType}>
 						<Standfirst
 							format={format}
 							standfirst={article.standfirst}
@@ -402,25 +397,10 @@ export const StandardLayout = (props: WebProps | AppProps) => {
 										article.mainMediaElements
 									}
 								/>
-								<MatchInfoContainer
-									isMatchReport={isMatchReport}
-									footballMatchStatsUrl={
-										footballMatchStatsUrl
-									}
-								/>
-
-								{isApps && (
-									<Island
-										priority="critical"
-										defer={{ until: 'visible' }}
-									>
-										<AppsEpic />
-									</Island>
-								)}
 							</>
 						)}
 					</GridItem>
-					<GridItem area="body" layoutType={layoutType} element="div">
+					<GridItem area="body" layoutType={layoutType}>
 						{/* Only show Listen to Article button on App landscape views */}
 						{isApps && (
 							<Hide until="leftCol">
@@ -519,6 +499,7 @@ export const StandardLayout = (props: WebProps | AppProps) => {
 											!!article.config.switches
 												.articleEndSlot
 										}
+										isSensitive={article.config.isSensitive}
 									/>
 								</Island>
 							)}

dotcom-rendering/src/layouts/lib/furnitureLayouts.ts

@@ -2,19 +2,16 @@ import { css, type SerializedStyles } from '@emotion/react';
 import { from, until } from '@guardian/source/foundations';
 import { type ColumnPreset, grid, type Line } from '../../grid';
 
-export type LayoutType = 'standard' | 'matchReport' | 'media';
+export type LayoutType = 'standard' | 'media';
 
 export type Area =
-	// Common areas
 	| 'title'
 	| 'headline'
 	| 'standfirst'
 	| 'main-media'
 	| 'meta'
 	| 'body'
-	| 'right-column'
-	// Match report specific area
-	| 'match-summary';
+	| 'right-column';
 
 type Breakpoint = 'mobile' | 'tablet' | 'desktop' | 'leftCol';
 
@@ -57,18 +54,6 @@ const furnitureRowLayouts: Record<LayoutType, LayoutDefinition> = {
 			['meta', 'body', 'right-column'],
 		],
 	},
-
-	matchReport: {
-		tablet: [['match-summary'], ...tabletVanillaRows],
-		desktop: [['match-summary', 'right-column'], ...desktopVanillaRows],
-		leftCol: [
-			['title', 'match-summary', 'right-column'],
-			['headline', 'right-column'],
-			['meta', 'main-media', 'right-column'],
-			['meta', 'body', 'right-column'],
-		],
-	},
-
 	media: {
 		mobile: mediaRowsUntilDesktop,
 		tablet: mediaRowsUntilDesktop,
@@ -110,7 +95,6 @@ const furnitureColumnLayouts: Record<LayoutType, ColumnLayoutMap> = {
 			desktop: ['centre-column-start', 'right-column-start'],
 		},
 	},
-	matchReport: furnitureColumnDefaults,
 };
 
 // Types