Skip to content

Commit 546b54a

Browse files
Conditionally render strech lines, turn of most viewed
1 parent a9b004d commit 546b54a

1 file changed

Lines changed: 21 additions & 16 deletions

File tree

dotcom-rendering/src/layouts/StandardLayout.tsx

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,6 @@ export const StandardLayout = (props: WebProps | AppProps) => {
167167
format.design === ArticleDesign.Video ||
168168
format.design === ArticleDesign.Audio;
169169

170-
const isVideo = format.design === ArticleDesign.Video;
171-
172170
const isShowcase = format.display === ArticleDisplay.Showcase;
173171

174172
const showComments = article.isCommentable && !isPaidContent;
@@ -312,7 +310,9 @@ export const StandardLayout = (props: WebProps | AppProps) => {
312310
hideCaption={isMedia}
313311
shouldHideAds={article.shouldHideAds}
314312
contentType={article.contentType}
315-
contentLayout="StandardLayout"
313+
contentLayout={`${
314+
ArticleDisplay[format.display]
315+
}Layout`}
316316
/>
317317
)}
318318
</GridItem>
@@ -353,18 +353,22 @@ export const StandardLayout = (props: WebProps | AppProps) => {
353353
layoutType={layoutType}
354354
element="aside"
355355
>
356-
<div css={stretchLines}>
357-
{isWeb &&
358-
format.theme === ArticleSpecial.Labs &&
359-
format.design !== ArticleDesign.Video ? (
360-
<GuardianLabsLines />
361-
) : (
362-
<DecideLines
363-
format={format}
364-
color={themePalette('--article-border')}
365-
/>
366-
)}
367-
</div>
356+
{!audioData && (
357+
<div css={stretchLines}>
358+
{isWeb &&
359+
format.theme === ArticleSpecial.Labs &&
360+
format.design !== ArticleDesign.Video ? (
361+
<GuardianLabsLines />
362+
) : (
363+
<DecideLines
364+
format={format}
365+
color={themePalette(
366+
'--article-border',
367+
)}
368+
/>
369+
)}
370+
</div>
371+
)}
368372
{isApps ? (
369373
<>
370374
<Hide from="leftCol">
@@ -465,7 +469,7 @@ export const StandardLayout = (props: WebProps | AppProps) => {
465469
{/* Only show Listen to Article button on App landscape views */}
466470
{isApps && (
467471
<Hide until="leftCol">
468-
{!isVideo && (
472+
{!isMedia && (
469473
<div
470474
css={css`
471475
margin-top: ${space[2]}px;
@@ -629,6 +633,7 @@ export const StandardLayout = (props: WebProps | AppProps) => {
629633
!!article.config
630634
.shouldHideReaderRevenue
631635
}
636+
shouldHideMostViewed={!!audioData}
632637
/>
633638
</Island>
634639
</Hide>

0 commit comments

Comments
 (0)