Skip to content

Commit fd51557

Browse files
committed
update font family style for new labs design
1 parent 8c598f2 commit fd51557

File tree

1 file changed

+10
-28
lines changed

1 file changed

+10
-28
lines changed

dotcom-rendering/src/components/CardHeadline.tsx

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -109,24 +109,7 @@ const fontFamilies = {
109109
xxxsmall: `${textSans15}\n\tline-height: 1.15;\n`,
110110
tiny: `${textSans12}\n\tline-height: 1.15;\n`,
111111
},
112-
} as const;
113-
114-
/** These represent the font groups used by card headline */
115-
const fontFamiliesLabs = {
116-
headlineMedium: {
117-
xxxlarge: headlineMedium64,
118-
xxlarge: headlineMedium50,
119-
xlarge: headlineMedium42,
120-
large: headlineMedium34,
121-
medium: headlineMedium28,
122-
small: headlineMedium24,
123-
xsmall: headlineMedium20,
124-
xxsmall: headlineMedium17,
125-
xxxsmall: headlineMedium15,
126-
tiny: headlineMedium14,
127-
},
128-
/** Line height for sans style headlines for labs is overridden to match that of other headlines (1.15) */
129-
textSans: {
112+
textSansBold: {
130113
xxxlarge: `${textSansBold20}\n\tline-height: 1.15;\n`,
131114
xxlarge: `${textSansBold20}\n\tline-height: 1.15;\n`,
132115
xlarge: `${textSansBold20}\n\tline-height: 1.15;\n`,
@@ -143,6 +126,7 @@ const fontFamiliesLabs = {
143126
export enum FontFamily {
144127
HeadlineMedium = 'headlineMedium',
145128
TextSans = 'textSans',
129+
TextSansBold = 'textSansBold',
146130
}
147131

148132
export type HeadlineSize = keyof typeof fontFamilies.headlineMedium;
@@ -154,12 +138,8 @@ export type ResponsiveFontSize = {
154138
mobileMedium?: HeadlineSize;
155139
};
156140

157-
const getFontSize = (
158-
sizes: ResponsiveFontSize,
159-
family: FontFamily,
160-
fontSource?: typeof fontFamilies | typeof fontFamiliesLabs,
161-
) => {
162-
const font = (fontSource ?? fontFamilies)[family];
141+
const getFontSize = (sizes: ResponsiveFontSize, family: FontFamily) => {
142+
const font = fontFamilies[family];
163143

164144
const { desktop, tablet, mobileMedium, mobile } = sizes;
165145

@@ -195,11 +175,13 @@ const getFonts = (
195175
showLabsRedesign: boolean,
196176
) => {
197177
const isLabs = format.theme === ArticleSpecial.Labs;
198-
const fontSource =
199-
isLabs && showLabsRedesign ? fontFamiliesLabs : fontFamilies;
200-
const family = isLabs ? FontFamily.TextSans : FontFamily.HeadlineMedium;
178+
const family = isLabs
179+
? showLabsRedesign
180+
? FontFamily.TextSansBold
181+
: FontFamily.TextSans
182+
: FontFamily.HeadlineMedium;
201183

202-
return getFontSize(fontSizes, family, fontSource);
184+
return getFontSize(fontSizes, family);
203185
};
204186

205187
export const WithLink = ({

0 commit comments

Comments
 (0)