Skip to content

Commit 0f1bfd6

Browse files
authored
Merge pull request #13475 from guardian/doml/cartoon-cards
Use lighter font for Cartoon front cards
2 parents bbd802f + 3b23434 commit 0f1bfd6

File tree

8 files changed

+22
-3
lines changed

8 files changed

+22
-3
lines changed

dotcom-rendering/src/components/Card/Card.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ export type Props = {
100100
isCrossword?: boolean;
101101
isNewsletter?: boolean;
102102
isOnwardContent?: boolean;
103+
isCartoon?: boolean;
103104
trailText?: string;
104105
avatarUrl?: string;
105106
showClock?: boolean;
@@ -392,6 +393,7 @@ export const Card = ({
392393
isCrossword,
393394
isNewsletter = false,
394395
isOnwardContent = false,
396+
isCartoon = false,
395397
isExternalLink,
396398
slideshowImages,
397399
showLivePlayable = false,
@@ -1093,6 +1095,7 @@ export const Card = ({
10931095
showByline={showByline}
10941096
isExternalLink={isExternalLink}
10951097
isBetaContainer={isBetaContainer}
1098+
isCartoon={isCartoon}
10961099
kickerImage={
10971100
showKickerImage &&
10981101
media?.type === 'podcast'

dotcom-rendering/src/components/CardHeadline.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ type Props = {
6464
kickerColour?: string;
6565
isBetaContainer?: boolean;
6666
kickerImage?: PodcastSeriesImage;
67+
isCartoon?: boolean;
6768
};
6869

6970
const sublinkStyles = css`
@@ -182,15 +183,17 @@ const getFonts = (
182183
format: ArticleFormat,
183184
fontSizes: ResponsiveFontSize,
184185
isBetaContainer: boolean,
186+
isCartoon: boolean,
185187
) => {
186188
if (format.theme === ArticleSpecial.Labs) {
187189
return getFontSize(fontSizes, FontFamily.TextSans);
188190
}
189191

190192
if (
191193
isBetaContainer &&
192-
/** Any of these designs are considered an "opinion" */
193-
(format.design === ArticleDesign.Comment ||
194+
(isCartoon ||
195+
/** Any of these designs are considered an "opinion" */
196+
format.design === ArticleDesign.Comment ||
194197
format.design === ArticleDesign.Editorial ||
195198
format.design === ArticleDesign.Letter)
196199
) {
@@ -234,11 +237,12 @@ export const CardHeadline = ({
234237
kickerColour = palette('--card-kicker-text'),
235238
isBetaContainer = false,
236239
kickerImage,
240+
isCartoon = false,
237241
}: Props) => {
238242
// The link is only applied directly to the headline if it is a sublink
239243
const isSublink = !!linkTo;
240244

241-
const fontStyles = getFonts(format, fontSizes, isBetaContainer);
245+
const fontStyles = getFonts(format, fontSizes, isBetaContainer, isCartoon);
242246

243247
return (
244248
<WithLink linkTo={linkTo}>

dotcom-rendering/src/components/FeatureCard.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ export type Props = {
198198
* Youtube requires a minimum width 200px.
199199
*/
200200
canPlayInline?: boolean;
201+
isCartoon?: boolean;
201202
kickerText?: string;
202203
showPulsingDot?: boolean;
203204
starRating?: Rating;
@@ -240,6 +241,7 @@ export const FeatureCard = ({
240241
showClock,
241242
mainMedia,
242243
canPlayInline,
244+
isCartoon,
243245
kickerText,
244246
showPulsingDot,
245247
dataLinkName,
@@ -478,6 +480,7 @@ export const FeatureCard = ({
478480
'--feature-card-kicker-text',
479481
)}
480482
isBetaContainer={true}
483+
isCartoon={isCartoon}
481484
/>
482485
</div>
483486

dotcom-rendering/src/components/FrontCard.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ export const FrontCard = (props: Props) => {
4343
image: trail.image,
4444
isCrossword: trail.isCrossword,
4545
isNewsletter: trail.isNewsletter,
46+
isCartoon: trail.isCartoon,
4647
canPlayInline: true,
4748
starRating: trail.starRating,
4849
dataLinkName: trail.dataLinkName,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ export const ScrollableFeature = ({
6161
discussionId={card.discussionId}
6262
mainMedia={card.mainMedia}
6363
isExternalLink={card.isExternalLink}
64+
isCartoon={card.isCartoon}
6465
// branding={card.branding}
6566
containerPalette={containerPalette}
6667
absoluteServerTimes={absoluteServerTimes}

dotcom-rendering/src/components/StaticFeatureTwo.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ export const StaticFeatureTwo = ({
6666
discussionId={card.discussionId}
6767
mainMedia={card.mainMedia}
6868
isExternalLink={card.isExternalLink}
69+
isCartoon={card.isCartoon}
6970
// branding={card.branding}
7071
containerPalette={containerPalette}
7172
trailText={undefined}

dotcom-rendering/src/model/enhanceCards.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,10 @@ export const enhanceCards = (
269269
(type === 'Tone' && id === 'tone/newsletter-tone'),
270270
);
271271

272+
const isCartoon = tags.some(
273+
({ id, type }) => type === 'Tone' && id === 'tone/cartoons',
274+
);
275+
272276
const branding = faciaCard.properties.editionBrandings.find(
273277
(editionBranding) => editionBranding.edition.id === editionId,
274278
)?.branding;
@@ -318,6 +322,7 @@ export const enhanceCards = (
318322
boostLevel: faciaCard.display.boostLevel,
319323
isCrossword: faciaCard.properties.isCrossword,
320324
isNewsletter,
325+
isCartoon,
321326
showQuotedHeadline: faciaCard.display.showQuotedHeadline,
322327
showLivePlayable: faciaCard.display.showLivePlayable,
323328
avatarUrl:

dotcom-rendering/src/types/front.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ export type DCRFrontCard = {
341341
boostLevel?: BoostLevel;
342342
isCrossword?: boolean;
343343
isNewsletter?: boolean;
344+
isCartoon?: boolean;
344345
discussionId?: string;
345346
byline?: string;
346347
showByline?: boolean;

0 commit comments

Comments
 (0)