From 5cb4b4df76a25d8bed304624dc15490cdb93b74c Mon Sep 17 00:00:00 2001 From: Simon Sinclair Date: Tue, 17 Nov 2020 16:17:29 +0000 Subject: [PATCH 01/10] Add BBC Reith Qalam font-face rules --- .../utilities/psammead-styles/src/fonts.js | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/packages/utilities/psammead-styles/src/fonts.js b/packages/utilities/psammead-styles/src/fonts.js index c5126b1cd0..4a04b84886 100644 --- a/packages/utilities/psammead-styles/src/fonts.js +++ b/packages/utilities/psammead-styles/src/fonts.js @@ -29,6 +29,9 @@ const baseUrlPadauk = const baseUrlShonarBangla = 'https://ws-downloads.files.bbci.co.uk/fonts/ShonarBangla/v5.91/'; +const baseUrlBBCReithQalam = + 'https://ws-downloads.test.files.bbci.co.uk/fonts/ReithQalam/v1.100/'; + // Reith Serif export const F_REITH_SERIF_REGULAR = baseUrlOverride => ` @font-face { @@ -621,3 +624,32 @@ export const F_SHONAR_BANGLA_BOLD = baseUrlOverride => ` font-display: optional; } `; + +// BBC Reith Qalam +export const F_REITH_QALAM_REGULAR = baseUrlOverride => ` + @font-face { + font-family: "BBC Reith Qalam"; + font-weight: 400; + font-style: normal; + src: url('${ + baseUrlOverride || baseUrlBBCReithQalam + }normal.woff2') format('woff2'), url('${ + baseUrlOverride || baseUrlBBCReithQalam +}normal.woff') format('woff'); + font-display: optional; + } +`; + +export const F_REITH_QALAM_BOLD = baseUrlOverride => ` + @font-face { + font-family: "BBC Reith Qalam"; + font-weight: 700; + font-style: normal; + src: url('${ + baseUrlOverride || baseUrlBBCReithQalam + }bold.woff2') format('woff2'), url('${ + baseUrlOverride || baseUrlBBCReithQalam +}bold.woff') format('woff'); + font-display: optional; + } +`; From ce69044963b378ca7caa74dcd8b67adacd568797 Mon Sep 17 00:00:00 2001 From: Simon Sinclair Date: Wed, 18 Nov 2020 14:43:30 +0000 Subject: [PATCH 02/10] Bump major package version --- packages/utilities/psammead-styles/package-lock.json | 2 +- packages/utilities/psammead-styles/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/utilities/psammead-styles/package-lock.json b/packages/utilities/psammead-styles/package-lock.json index ac463c15b0..837d8bed4b 100644 --- a/packages/utilities/psammead-styles/package-lock.json +++ b/packages/utilities/psammead-styles/package-lock.json @@ -1,5 +1,5 @@ { "name": "@bbc/psammead-styles", - "version": "6.1.0", + "version": "7.0.0", "lockfileVersion": 1 } diff --git a/packages/utilities/psammead-styles/package.json b/packages/utilities/psammead-styles/package.json index 4cf934cb59..cb800c9b6e 100644 --- a/packages/utilities/psammead-styles/package.json +++ b/packages/utilities/psammead-styles/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-styles", - "version": "6.1.0", + "version": "7.0.0", "description": "A collection of string constants for use in CSS, containing non-GEL styling details that are bespoke to specific BBC services and products.", "repository": { "type": "git", From e1899958f20eb9177d461b2b898d25b8c58b923c Mon Sep 17 00:00:00 2001 From: Simon Sinclair Date: Wed, 18 Nov 2020 14:43:36 +0000 Subject: [PATCH 03/10] Add changelog entry --- packages/utilities/psammead-styles/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/utilities/psammead-styles/CHANGELOG.md b/packages/utilities/psammead-styles/CHANGELOG.md index c0a2c148c5..46dd2540de 100644 --- a/packages/utilities/psammead-styles/CHANGELOG.md +++ b/packages/utilities/psammead-styles/CHANGELOG.md @@ -3,6 +3,7 @@ | Version | Description | |---------|-------------| +| 7.0.0 | [PR#????](https://github.com/bbc/psammead/pull/????) Replace BBC Nassim with BBC Reith Qalam. | | 6.1.0 | [PR#3942](https://github.com/bbc/psammead/pull/3942) Move @font-face declarations outside of html selector. | | 6.0.1 | [PR#3924](https://github.com/bbc/psammead/pull/3924) Migrate Storybook to Emotion. | | 6.0.0 | [PR#3880](https://github.com/bbc/psammead/pull/3880) Migrate to Emotion. | From 370f817945478b5c071fcf918fbad2365f5c80fa Mon Sep 17 00:00:00 2001 From: Simon Sinclair Date: Wed, 18 Nov 2020 14:44:48 +0000 Subject: [PATCH 04/10] Replace BBC Nassim font-families with BBC Reith Qalam's --- .../psammead-styles/src/font-families.js | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/packages/utilities/psammead-styles/src/font-families.js b/packages/utilities/psammead-styles/src/font-families.js index 1e81844c46..6314382463 100644 --- a/packages/utilities/psammead-styles/src/font-families.js +++ b/packages/utilities/psammead-styles/src/font-families.js @@ -1,7 +1,6 @@ /* * BBC REITH */ - const reithFallback = `Helvetica, Arial, sans-serif;`; const reithSans = `font-family: ReithSans, ${reithFallback}`; const reithSerif = `font-family: ReithSerif, ${reithFallback}`; @@ -56,7 +55,6 @@ const latinReithFontStyles = { /* * HELMET */ - const helmet = `font-family: Helmet, Freesans, Helvetica, Arial, sans-serif;`; const helmetFontStyles = { @@ -79,24 +77,21 @@ const helmetFontStyles = { }; /* - * BBC NASSIM + * BBC REITH QALAM */ +const reithQalamFallback = 'Arial, Verdana, Geneva, Helvetica, sans-serif;'; +const reithQalamFontFamily = `font-family: "BBC Reith Qalam", ${reithQalamFallback}`; -const nassimArabicFontFamily = `font-family: "BBC Nassim Arabic", Arial, Verdana, Geneva, Helvetica, sans-serif;`; -const nassimPashtoFontFamily = `font-family: "BBC Nassim Pashto", Arial, Verdana, Geneva, Helvetica, sans-serif;`; -const nassimPersianFontFamily = `font-family: "BBC Nassim Persian", Arial, Verdana, Geneva, Helvetica, sans-serif;`; -const nassimUrduFontFamily = `font-family: "BBC Nassim Urdu", Arial, Verdana, Geneva, Helvetica, sans-serif;`; - -const nassimFontStyles = fontFamily => ({ +const reithQalamStyles = { sansRegular: ` - ${fontFamily} + ${reithQalamFontFamily} ${getFontStyleAndWeight('normal', 400)} `, sansBold: ` - ${fontFamily} + ${reithQalamFontFamily} ${getFontStyleAndWeight('normal', 700)} `, -}); +}; /* * AMHARIC @@ -369,7 +364,7 @@ const optimoBaseFontStyles = { export const afaanoromoo = helmetFontStyles; export const afrique = helmetFontStyles; export const amharic = amharicStyles; -export const arabic = nassimFontStyles(nassimArabicFontFamily); +export const arabic = reithQalamStyles; export const archive = latinReithFontStyles; export const azeri = helmetFontStyles; export const bengali = bengaliStyles; @@ -391,8 +386,8 @@ export const naidheachdan = latinReithFontStyles; export const nepali = nepaliStyles; export const news = latinReithFontStyles; export const optimobase = optimoBaseFontStyles; -export const pashto = nassimFontStyles(nassimPashtoFontFamily); -export const persian = nassimFontStyles(nassimPersianFontFamily); +export const pashto = reithQalamStyles; +export const persian = reithQalamStyles; export const pidgin = helmetFontStyles; export const portuguese = latinReithFontStyles; export const punjabi = punjabiStyles; @@ -409,7 +404,7 @@ export const tigrinya = tigrinyaStyles; export const turkce = latinReithFontStyles; export const ukchina = chineseFontStyles; export const ukrainian = helmetFontStyles; -export const urdu = nassimFontStyles(nassimUrduFontFamily); +export const urdu = reithQalamStyles; export const uzbek = helmetFontStyles; export const vietnamese = helmetFontStyles; export const weather = latinReithFontStyles; From 0d6291592e7ccf3b9cb261a780376b072e4fc477 Mon Sep 17 00:00:00 2001 From: Simon Sinclair Date: Wed, 18 Nov 2020 14:48:05 +0000 Subject: [PATCH 05/10] Remove BBC Nassim font-face rules --- .../utilities/psammead-styles/src/fonts.js | 155 ------------------ 1 file changed, 155 deletions(-) diff --git a/packages/utilities/psammead-styles/src/fonts.js b/packages/utilities/psammead-styles/src/fonts.js index 4a04b84886..1649d62c32 100644 --- a/packages/utilities/psammead-styles/src/fonts.js +++ b/packages/utilities/psammead-styles/src/fonts.js @@ -1,17 +1,5 @@ const baseFontUrl = 'https://gel.files.bbci.co.uk/r2.511/'; -const baseUrlBBCNassimArabic = - 'https://ws-downloads.files.bbci.co.uk/fonts/NassimArabic/v1.441/'; - -const baseUrlBBCNassimPashto = - 'https://ws-downloads.files.bbci.co.uk/fonts/NassimPashto/v1.57/'; - -const baseUrlBBCNassimPersian = - 'https://ws-downloads.files.bbci.co.uk/fonts/NassimPersian/v1.511/'; - -const baseUrlBBCNassimUrdu = - 'https://ws-downloads.files.bbci.co.uk/fonts/NassimUrdu/v1.60/'; - const baseUrlIskoolaPotaBBC = 'https://ws-downloads.files.bbci.co.uk/fonts/IskoolaPota/v5.91/'; @@ -157,7 +145,6 @@ export const F_REITH_SERIF_EXTRA_BOLD_ITALIC = baseUrlOverride => ` }`; // Reith Sans - export const F_REITH_SANS_REGULAR = baseUrlOverride => ` @font-face { font-family: "ReithSans"; @@ -305,144 +292,7 @@ export const F_REITH_SANS_CONDENSED_BOLD = baseUrlOverride => ` font-display: optional; }`; -// BBC Nassim Arabic - -export const F_NASSIM_ARABIC_REGULAR = baseUrlOverride => ` - @font-face { - font-family: "BBC Nassim Arabic"; - font-weight: 400; - font-style: normal; - src: url('${ - baseUrlOverride || baseUrlBBCNassimArabic - }normal.woff') format('woff'), url('${ - baseUrlOverride || baseUrlBBCNassimArabic -}normal.eot') format('eot'), url('${ - baseUrlOverride || baseUrlBBCNassimArabic -}normal.ttf') format('ttf'); - font-display: optional; - } -`; - -export const F_NASSIM_ARABIC_BOLD = baseUrlOverride => ` - @font-face { - font-family: "BBC Nassim Arabic"; - font-weight: 700; - font-style: normal; - src: url('${ - baseUrlOverride || baseUrlBBCNassimArabic - }bold.woff') format('woff'), url('${ - baseUrlOverride || baseUrlBBCNassimArabic -}bold.eot') format('eot'), url('${ - baseUrlOverride || baseUrlBBCNassimArabic -}bold.ttf') format('ttf'); - font-display: optional; - } -`; - -// BBC Nassim Pashto - -export const F_NASSIM_PASHTO_REGULAR = baseUrlOverride => ` - @font-face { - font-family: "BBC Nassim Pashto"; - font-weight: 400; - font-style: normal; - src: url('${ - baseUrlOverride || baseUrlBBCNassimPashto - }normal.woff') format('woff'), url('${ - baseUrlOverride || baseUrlBBCNassimPashto -}normal.eot') format('eot'), url('${ - baseUrlOverride || baseUrlBBCNassimPashto -}normal.ttf') format('ttf'); - font-display: optional; - } -`; - -export const F_NASSIM_PASHTO_BOLD = baseUrlOverride => ` - @font-face { - font-family: "BBC Nassim Pashto"; - font-weight: 700; - font-style: normal; - src: url('${ - baseUrlOverride || baseUrlBBCNassimPashto - }bold.woff') format('woff'), url('${ - baseUrlOverride || baseUrlBBCNassimPashto -}bold.eot') format('eot'), url('${ - baseUrlOverride || baseUrlBBCNassimPashto -}bold.ttf') format('ttf'); - font-display: optional; - } -`; - -// BBC Nassim Persian - -export const F_NASSIM_PERSIAN_REGULAR = baseUrlOverride => ` - @font-face { - font-family: "BBC Nassim Persian"; - font-weight: 400; - font-style: normal; - src: url('${ - baseUrlOverride || baseUrlBBCNassimPersian - }normal.woff') format('woff'), url('${ - baseUrlBBCNassimPersian || baseUrlOverride -}normal.eot') format('eot'), url('${ - baseUrlOverride || baseUrlBBCNassimPersian -}normal.ttf') format('ttf'); - font-display: optional; - } -`; - -export const F_NASSIM_PERSIAN_BOLD = baseUrlOverride => ` - @font-face { - font-family: "BBC Nassim Persian"; - font-weight: 700; - font-style: normal; - src: url('${ - baseUrlOverride || baseUrlBBCNassimPersian - }bold.woff') format('woff'), url('${ - baseUrlBBCNassimPersian || baseUrlOverride -}bold.eot') format('eot'), url('${ - baseUrlOverride || baseUrlBBCNassimPersian -}bold.ttf') format('ttf'); - font-display: optional; - } -`; - -// BBC Nassim Urdu - -export const F_NASSIM_URDU_REGULAR = baseUrlOverride => ` - @font-face { - font-family: "BBC Nassim Urdu"; - font-weight: 400; - font-style: normal; - src: url('${ - baseUrlOverride || baseUrlBBCNassimUrdu - }normal.woff') format('woff'), url('${ - baseUrlOverride || baseUrlBBCNassimUrdu -}normal.eot') format('eot'), url('${ - baseUrlOverride || baseUrlBBCNassimUrdu -}normal.ttf') format('ttf'); - font-display: optional; - } -`; - -export const F_NASSIM_URDU_BOLD = baseUrlOverride => ` - @font-face { - font-family: "BBC Nassim Urdu"; - font-weight: 700; - font-style: normal; - src: url('${ - baseUrlOverride || baseUrlBBCNassimUrdu - }bold.woff') format('woff'), url('${ - baseUrlOverride || baseUrlBBCNassimUrdu -}bold.eot') format('eot'), url('${ - baseUrlOverride || baseUrlBBCNassimUrdu -}bold.ttf') format('ttf'); - font-display: optional; - } -`; - // Iskoola Pota BBC - export const F_ISKOOLA_POTA_BBC_REGULAR = baseUrlOverride => ` @font-face { font-family: "Iskoola Pota BBC"; @@ -475,7 +325,6 @@ export const F_ISKOOLA_POTA_BBC_BOLD = baseUrlOverride => ` `; // Latha - export const F_LATHA_REGULAR = baseUrlOverride => ` @font-face { font-family: "Latha"; @@ -508,7 +357,6 @@ export const F_LATHA_BOLD = baseUrlOverride => ` `; // Mallanna - export const F_MALLANNA_REGULAR = baseUrlOverride => ` @font-face { font-family: "Mallanna"; @@ -526,7 +374,6 @@ export const F_MALLANNA_REGULAR = baseUrlOverride => ` `; // Noto Sans Ethiopic - export const F_NOTO_SANS_ETHIOPIC_REGULAR = baseUrlOverride => ` @font-face { font-family: "Noto Sans Ethiopic"; @@ -560,7 +407,6 @@ export const F_NOTO_SANS_ETHIOPIC_BOLD = baseUrlOverride => ` `; // Padauk - export const F_PADAUK_REGULAR = baseUrlOverride => ` @font-face { font-family: "Padauk"; @@ -593,7 +439,6 @@ export const F_PADAUK_BOLD = baseUrlOverride => ` `; // Shonar Bangla - export const F_SHONAR_BANGLA_REGULAR = baseUrlOverride => ` @font-face { font-family: "Shonar Bangla"; From 59afb7396745722b3172634d0c08b012d6da2f3d Mon Sep 17 00:00:00 2001 From: Simon Sinclair Date: Wed, 18 Nov 2020 14:48:40 +0000 Subject: [PATCH 06/10] Update fonts snapshots --- .../src/__snapshots__/fonts.test.js.snap | 232 ++++-------------- 1 file changed, 44 insertions(+), 188 deletions(-) diff --git a/packages/utilities/psammead-styles/src/__snapshots__/fonts.test.js.snap b/packages/utilities/psammead-styles/src/__snapshots__/fonts.test.js.snap index 86e8466b5a..b946452472 100644 --- a/packages/utilities/psammead-styles/src/__snapshots__/fonts.test.js.snap +++ b/packages/utilities/psammead-styles/src/__snapshots__/fonts.test.js.snap @@ -116,292 +116,148 @@ exports[`Psammead Styles - Fonts should match MALLANNA REGULAR with overridden u " `; -exports[`Psammead Styles - Fonts should match NASSIM ARABIC BOLD base font url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SANS ETHIOPIC BOLD base font url 1`] = ` " @font-face { - font-family: \\"BBC Nassim Arabic\\"; + font-family: \\"Noto Sans Ethiopic\\"; font-weight: 700; font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/NassimArabic/v1.441/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimArabic/v1.441/bold.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimArabic/v1.441/bold.ttf') format('ttf'); - font-display: optional; + src: url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/bold.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/bold.ttf') format('ttf'); + font-display: swap; } " `; -exports[`Psammead Styles - Fonts should match NASSIM ARABIC BOLD with overridden url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SANS ETHIOPIC BOLD with overridden url 1`] = ` " @font-face { - font-family: \\"BBC Nassim Arabic\\"; + font-family: \\"Noto Sans Ethiopic\\"; font-weight: 700; font-style: normal; src: url('https://example.com/bold.woff') format('woff'), url('https://example.com/bold.eot') format('eot'), url('https://example.com/bold.ttf') format('ttf'); - font-display: optional; + font-display: swap; } " `; -exports[`Psammead Styles - Fonts should match NASSIM ARABIC REGULAR base font url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SANS ETHIOPIC REGULAR base font url 1`] = ` " @font-face { - font-family: \\"BBC Nassim Arabic\\"; + font-family: \\"Noto Sans Ethiopic\\"; font-weight: 400; font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/NassimArabic/v1.441/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimArabic/v1.441/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimArabic/v1.441/normal.ttf') format('ttf'); - font-display: optional; + src: url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/normal.ttf') format('ttf'); + font-display: swap; } -" + " `; -exports[`Psammead Styles - Fonts should match NASSIM ARABIC REGULAR with overridden url 1`] = ` +exports[`Psammead Styles - Fonts should match NOTO SANS ETHIOPIC REGULAR with overridden url 1`] = ` " @font-face { - font-family: \\"BBC Nassim Arabic\\"; + font-family: \\"Noto Sans Ethiopic\\"; font-weight: 400; font-style: normal; src: url('https://example.com/normal.woff') format('woff'), url('https://example.com/normal.eot') format('eot'), url('https://example.com/normal.ttf') format('ttf'); - font-display: optional; + font-display: swap; } -" + " `; -exports[`Psammead Styles - Fonts should match NASSIM PASHTO BOLD base font url 1`] = ` +exports[`Psammead Styles - Fonts should match PADAUK BOLD base font url 1`] = ` " @font-face { - font-family: \\"BBC Nassim Pashto\\"; + font-family: \\"Padauk\\"; font-weight: 700; font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/NassimPashto/v1.57/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimPashto/v1.57/bold.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimPashto/v1.57/bold.ttf') format('ttf'); - font-display: optional; + src: url('https://ws-downloads.files.bbci.co.uk/fonts/Padauk/v2.8/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/Padauk/v2.8/bold.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/Padauk/v2.8/bold.ttf') format('ttf'); + font-display: swap; } " `; -exports[`Psammead Styles - Fonts should match NASSIM PASHTO BOLD with overridden url 1`] = ` +exports[`Psammead Styles - Fonts should match PADAUK BOLD with overridden url 1`] = ` " @font-face { - font-family: \\"BBC Nassim Pashto\\"; + font-family: \\"Padauk\\"; font-weight: 700; font-style: normal; src: url('https://example.com/bold.woff') format('woff'), url('https://example.com/bold.eot') format('eot'), url('https://example.com/bold.ttf') format('ttf'); - font-display: optional; + font-display: swap; } " `; -exports[`Psammead Styles - Fonts should match NASSIM PASHTO REGULAR base font url 1`] = ` +exports[`Psammead Styles - Fonts should match PADAUK REGULAR base font url 1`] = ` " @font-face { - font-family: \\"BBC Nassim Pashto\\"; + font-family: \\"Padauk\\"; font-weight: 400; font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/NassimPashto/v1.57/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimPashto/v1.57/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimPashto/v1.57/normal.ttf') format('ttf'); - font-display: optional; - } -" + src: url('https://ws-downloads.files.bbci.co.uk/fonts/Padauk/v2.8/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/Padauk/v2.8/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/Padauk/v2.8/normal.ttf') format('ttf'); + font-display: swap; + }" `; -exports[`Psammead Styles - Fonts should match NASSIM PASHTO REGULAR with overridden url 1`] = ` +exports[`Psammead Styles - Fonts should match PADAUK REGULAR with overridden url 1`] = ` " @font-face { - font-family: \\"BBC Nassim Pashto\\"; + font-family: \\"Padauk\\"; font-weight: 400; font-style: normal; src: url('https://example.com/normal.woff') format('woff'), url('https://example.com/normal.eot') format('eot'), url('https://example.com/normal.ttf') format('ttf'); - font-display: optional; - } -" -`; - -exports[`Psammead Styles - Fonts should match NASSIM PERSIAN BOLD base font url 1`] = ` -" - @font-face { - font-family: \\"BBC Nassim Persian\\"; - font-weight: 700; - font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/NassimPersian/v1.511/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimPersian/v1.511/bold.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimPersian/v1.511/bold.ttf') format('ttf'); - font-display: optional; - } -" -`; - -exports[`Psammead Styles - Fonts should match NASSIM PERSIAN BOLD with overridden url 1`] = ` -" - @font-face { - font-family: \\"BBC Nassim Persian\\"; - font-weight: 700; - font-style: normal; - src: url('https://example.com/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimPersian/v1.511/bold.eot') format('eot'), url('https://example.com/bold.ttf') format('ttf'); - font-display: optional; - } -" -`; - -exports[`Psammead Styles - Fonts should match NASSIM PERSIAN REGULAR base font url 1`] = ` -" - @font-face { - font-family: \\"BBC Nassim Persian\\"; - font-weight: 400; - font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/NassimPersian/v1.511/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimPersian/v1.511/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimPersian/v1.511/normal.ttf') format('ttf'); - font-display: optional; - } -" -`; - -exports[`Psammead Styles - Fonts should match NASSIM PERSIAN REGULAR with overridden url 1`] = ` -" - @font-face { - font-family: \\"BBC Nassim Persian\\"; - font-weight: 400; - font-style: normal; - src: url('https://example.com/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimPersian/v1.511/normal.eot') format('eot'), url('https://example.com/normal.ttf') format('ttf'); - font-display: optional; - } -" + font-display: swap; + }" `; -exports[`Psammead Styles - Fonts should match NASSIM URDU BOLD base font url 1`] = ` +exports[`Psammead Styles - Fonts should match REITH QALAM BOLD base font url 1`] = ` " @font-face { - font-family: \\"BBC Nassim Urdu\\"; + font-family: \\"BBC Reith Qalam\\"; font-weight: 700; font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/NassimUrdu/v1.60/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimUrdu/v1.60/bold.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimUrdu/v1.60/bold.ttf') format('ttf'); + src: url('https://ws-downloads.test.files.bbci.co.uk/fonts/ReithQalam/v1.100/bold.woff2') format('woff2'), url('https://ws-downloads.test.files.bbci.co.uk/fonts/ReithQalam/v1.100/bold.woff') format('woff'); font-display: optional; } " `; -exports[`Psammead Styles - Fonts should match NASSIM URDU BOLD with overridden url 1`] = ` +exports[`Psammead Styles - Fonts should match REITH QALAM BOLD with overridden url 1`] = ` " @font-face { - font-family: \\"BBC Nassim Urdu\\"; + font-family: \\"BBC Reith Qalam\\"; font-weight: 700; font-style: normal; - src: url('https://example.com/bold.woff') format('woff'), url('https://example.com/bold.eot') format('eot'), url('https://example.com/bold.ttf') format('ttf'); + src: url('https://example.com/bold.woff2') format('woff2'), url('https://example.com/bold.woff') format('woff'); font-display: optional; } " `; -exports[`Psammead Styles - Fonts should match NASSIM URDU REGULAR base font url 1`] = ` +exports[`Psammead Styles - Fonts should match REITH QALAM REGULAR base font url 1`] = ` " @font-face { - font-family: \\"BBC Nassim Urdu\\"; + font-family: \\"BBC Reith Qalam\\"; font-weight: 400; font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/NassimUrdu/v1.60/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimUrdu/v1.60/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NassimUrdu/v1.60/normal.ttf') format('ttf'); + src: url('https://ws-downloads.test.files.bbci.co.uk/fonts/ReithQalam/v1.100/normal.woff2') format('woff2'), url('https://ws-downloads.test.files.bbci.co.uk/fonts/ReithQalam/v1.100/normal.woff') format('woff'); font-display: optional; } " `; -exports[`Psammead Styles - Fonts should match NASSIM URDU REGULAR with overridden url 1`] = ` +exports[`Psammead Styles - Fonts should match REITH QALAM REGULAR with overridden url 1`] = ` " @font-face { - font-family: \\"BBC Nassim Urdu\\"; + font-family: \\"BBC Reith Qalam\\"; font-weight: 400; font-style: normal; - src: url('https://example.com/normal.woff') format('woff'), url('https://example.com/normal.eot') format('eot'), url('https://example.com/normal.ttf') format('ttf'); + src: url('https://example.com/normal.woff2') format('woff2'), url('https://example.com/normal.woff') format('woff'); font-display: optional; } " `; -exports[`Psammead Styles - Fonts should match NOTO SANS ETHIOPIC BOLD base font url 1`] = ` -" - @font-face { - font-family: \\"Noto Sans Ethiopic\\"; - font-weight: 700; - font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/bold.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/bold.ttf') format('ttf'); - font-display: swap; - } -" -`; - -exports[`Psammead Styles - Fonts should match NOTO SANS ETHIOPIC BOLD with overridden url 1`] = ` -" - @font-face { - font-family: \\"Noto Sans Ethiopic\\"; - font-weight: 700; - font-style: normal; - src: url('https://example.com/bold.woff') format('woff'), url('https://example.com/bold.eot') format('eot'), url('https://example.com/bold.ttf') format('ttf'); - font-display: swap; - } -" -`; - -exports[`Psammead Styles - Fonts should match NOTO SANS ETHIOPIC REGULAR base font url 1`] = ` -" - @font-face { - font-family: \\"Noto Sans Ethiopic\\"; - font-weight: 400; - font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/NotoSansEthiopic/v1.901/normal.ttf') format('ttf'); - font-display: swap; - } - " -`; - -exports[`Psammead Styles - Fonts should match NOTO SANS ETHIOPIC REGULAR with overridden url 1`] = ` -" - @font-face { - font-family: \\"Noto Sans Ethiopic\\"; - font-weight: 400; - font-style: normal; - src: url('https://example.com/normal.woff') format('woff'), url('https://example.com/normal.eot') format('eot'), url('https://example.com/normal.ttf') format('ttf'); - font-display: swap; - } - " -`; - -exports[`Psammead Styles - Fonts should match PADAUK BOLD base font url 1`] = ` -" - @font-face { - font-family: \\"Padauk\\"; - font-weight: 700; - font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/Padauk/v2.8/bold.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/Padauk/v2.8/bold.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/Padauk/v2.8/bold.ttf') format('ttf'); - font-display: swap; - } -" -`; - -exports[`Psammead Styles - Fonts should match PADAUK BOLD with overridden url 1`] = ` -" - @font-face { - font-family: \\"Padauk\\"; - font-weight: 700; - font-style: normal; - src: url('https://example.com/bold.woff') format('woff'), url('https://example.com/bold.eot') format('eot'), url('https://example.com/bold.ttf') format('ttf'); - font-display: swap; - } -" -`; - -exports[`Psammead Styles - Fonts should match PADAUK REGULAR base font url 1`] = ` -" - @font-face { - font-family: \\"Padauk\\"; - font-weight: 400; - font-style: normal; - src: url('https://ws-downloads.files.bbci.co.uk/fonts/Padauk/v2.8/normal.woff') format('woff'), url('https://ws-downloads.files.bbci.co.uk/fonts/Padauk/v2.8/normal.eot') format('eot'), url('https://ws-downloads.files.bbci.co.uk/fonts/Padauk/v2.8/normal.ttf') format('ttf'); - font-display: swap; - }" -`; - -exports[`Psammead Styles - Fonts should match PADAUK REGULAR with overridden url 1`] = ` -" - @font-face { - font-family: \\"Padauk\\"; - font-weight: 400; - font-style: normal; - src: url('https://example.com/normal.woff') format('woff'), url('https://example.com/normal.eot') format('eot'), url('https://example.com/normal.ttf') format('ttf'); - font-display: swap; - }" -`; - exports[`Psammead Styles - Fonts should match REITH SANS BOLD ITALIC base font url 1`] = ` " @font-face { From f4f049a88bf4533e3aab8060b6659f435b01818e Mon Sep 17 00:00:00 2001 From: Simon Sinclair Date: Wed, 18 Nov 2020 14:48:49 +0000 Subject: [PATCH 07/10] Update font-styles snapshots --- .../__snapshots__/font-styles.test.js.snap | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/packages/utilities/psammead-styles/src/__snapshots__/font-styles.test.js.snap b/packages/utilities/psammead-styles/src/__snapshots__/font-styles.test.js.snap index 44df615fc1..93e8092b38 100644 --- a/packages/utilities/psammead-styles/src/__snapshots__/font-styles.test.js.snap +++ b/packages/utilities/psammead-styles/src/__snapshots__/font-styles.test.js.snap @@ -26,7 +26,7 @@ exports[`should render SansBold correctly for amharic 1`] = ` exports[`should render SansBold correctly for arabic 1`] = ` " - font-family: \\"BBC Nassim Arabic\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -202,7 +202,7 @@ exports[`should render SansBold correctly for optimobase 1`] = ` exports[`should render SansBold correctly for pashto 1`] = ` " - font-family: \\"BBC Nassim Pashto\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -210,7 +210,7 @@ exports[`should render SansBold correctly for pashto 1`] = ` exports[`should render SansBold correctly for persian 1`] = ` " - font-family: \\"BBC Nassim Persian\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -346,7 +346,7 @@ exports[`should render SansBold correctly for ukrainian 1`] = ` exports[`should render SansBold correctly for urdu 1`] = ` " - font-family: \\"BBC Nassim Urdu\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -418,7 +418,7 @@ exports[`should render SansBoldItalic correctly for amharic 1`] = ` exports[`should render SansBoldItalic correctly for arabic 1`] = ` " - font-family: \\"BBC Nassim Arabic\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -594,7 +594,7 @@ exports[`should render SansBoldItalic correctly for optimobase 1`] = ` exports[`should render SansBoldItalic correctly for pashto 1`] = ` " - font-family: \\"BBC Nassim Pashto\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -602,7 +602,7 @@ exports[`should render SansBoldItalic correctly for pashto 1`] = ` exports[`should render SansBoldItalic correctly for persian 1`] = ` " - font-family: \\"BBC Nassim Persian\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -738,7 +738,7 @@ exports[`should render SansBoldItalic correctly for ukrainian 1`] = ` exports[`should render SansBoldItalic correctly for urdu 1`] = ` " - font-family: \\"BBC Nassim Urdu\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -810,7 +810,7 @@ exports[`should render SansLight correctly for amharic 1`] = ` exports[`should render SansLight correctly for arabic 1`] = ` " - font-family: \\"BBC Nassim Arabic\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -986,7 +986,7 @@ exports[`should render SansLight correctly for optimobase 1`] = ` exports[`should render SansLight correctly for pashto 1`] = ` " - font-family: \\"BBC Nassim Pashto\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -994,7 +994,7 @@ exports[`should render SansLight correctly for pashto 1`] = ` exports[`should render SansLight correctly for persian 1`] = ` " - font-family: \\"BBC Nassim Persian\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -1130,7 +1130,7 @@ exports[`should render SansLight correctly for ukrainian 1`] = ` exports[`should render SansLight correctly for urdu 1`] = ` " - font-family: \\"BBC Nassim Urdu\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -1202,7 +1202,7 @@ exports[`should render SansRegular correctly for amharic 1`] = ` exports[`should render SansRegular correctly for arabic 1`] = ` " - font-family: \\"BBC Nassim Arabic\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -1378,7 +1378,7 @@ exports[`should render SansRegular correctly for optimobase 1`] = ` exports[`should render SansRegular correctly for pashto 1`] = ` " - font-family: \\"BBC Nassim Pashto\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -1386,7 +1386,7 @@ exports[`should render SansRegular correctly for pashto 1`] = ` exports[`should render SansRegular correctly for persian 1`] = ` " - font-family: \\"BBC Nassim Persian\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -1522,7 +1522,7 @@ exports[`should render SansRegular correctly for ukrainian 1`] = ` exports[`should render SansRegular correctly for urdu 1`] = ` " - font-family: \\"BBC Nassim Urdu\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -1594,7 +1594,7 @@ exports[`should render SansRegularItalic correctly for amharic 1`] = ` exports[`should render SansRegularItalic correctly for arabic 1`] = ` " - font-family: \\"BBC Nassim Arabic\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -1770,7 +1770,7 @@ exports[`should render SansRegularItalic correctly for optimobase 1`] = ` exports[`should render SansRegularItalic correctly for pashto 1`] = ` " - font-family: \\"BBC Nassim Pashto\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -1778,7 +1778,7 @@ exports[`should render SansRegularItalic correctly for pashto 1`] = ` exports[`should render SansRegularItalic correctly for persian 1`] = ` " - font-family: \\"BBC Nassim Persian\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -1914,7 +1914,7 @@ exports[`should render SansRegularItalic correctly for ukrainian 1`] = ` exports[`should render SansRegularItalic correctly for urdu 1`] = ` " - font-family: \\"BBC Nassim Urdu\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -1986,7 +1986,7 @@ exports[`should render SerifBold correctly for amharic 1`] = ` exports[`should render SerifBold correctly for arabic 1`] = ` " - font-family: \\"BBC Nassim Arabic\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -2162,7 +2162,7 @@ exports[`should render SerifBold correctly for optimobase 1`] = ` exports[`should render SerifBold correctly for pashto 1`] = ` " - font-family: \\"BBC Nassim Pashto\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -2170,7 +2170,7 @@ exports[`should render SerifBold correctly for pashto 1`] = ` exports[`should render SerifBold correctly for persian 1`] = ` " - font-family: \\"BBC Nassim Persian\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -2306,7 +2306,7 @@ exports[`should render SerifBold correctly for ukrainian 1`] = ` exports[`should render SerifBold correctly for urdu 1`] = ` " - font-family: \\"BBC Nassim Urdu\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -2378,7 +2378,7 @@ exports[`should render SerifLight correctly for amharic 1`] = ` exports[`should render SerifLight correctly for arabic 1`] = ` " - font-family: \\"BBC Nassim Arabic\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -2554,7 +2554,7 @@ exports[`should render SerifLight correctly for optimobase 1`] = ` exports[`should render SerifLight correctly for pashto 1`] = ` " - font-family: \\"BBC Nassim Pashto\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -2562,7 +2562,7 @@ exports[`should render SerifLight correctly for pashto 1`] = ` exports[`should render SerifLight correctly for persian 1`] = ` " - font-family: \\"BBC Nassim Persian\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -2698,7 +2698,7 @@ exports[`should render SerifLight correctly for ukrainian 1`] = ` exports[`should render SerifLight correctly for urdu 1`] = ` " - font-family: \\"BBC Nassim Urdu\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -2770,7 +2770,7 @@ exports[`should render SerifMedium correctly for amharic 1`] = ` exports[`should render SerifMedium correctly for arabic 1`] = ` " - font-family: \\"BBC Nassim Arabic\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -2946,7 +2946,7 @@ exports[`should render SerifMedium correctly for optimobase 1`] = ` exports[`should render SerifMedium correctly for pashto 1`] = ` " - font-family: \\"BBC Nassim Pashto\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -2954,7 +2954,7 @@ exports[`should render SerifMedium correctly for pashto 1`] = ` exports[`should render SerifMedium correctly for persian 1`] = ` " - font-family: \\"BBC Nassim Persian\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -3090,7 +3090,7 @@ exports[`should render SerifMedium correctly for ukrainian 1`] = ` exports[`should render SerifMedium correctly for urdu 1`] = ` " - font-family: \\"BBC Nassim Urdu\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -3162,7 +3162,7 @@ exports[`should render SerifMediumItalic correctly for amharic 1`] = ` exports[`should render SerifMediumItalic correctly for arabic 1`] = ` " - font-family: \\"BBC Nassim Arabic\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -3338,7 +3338,7 @@ exports[`should render SerifMediumItalic correctly for optimobase 1`] = ` exports[`should render SerifMediumItalic correctly for pashto 1`] = ` " - font-family: \\"BBC Nassim Pashto\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -3346,7 +3346,7 @@ exports[`should render SerifMediumItalic correctly for pashto 1`] = ` exports[`should render SerifMediumItalic correctly for persian 1`] = ` " - font-family: \\"BBC Nassim Persian\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -3482,7 +3482,7 @@ exports[`should render SerifMediumItalic correctly for ukrainian 1`] = ` exports[`should render SerifMediumItalic correctly for urdu 1`] = ` " - font-family: \\"BBC Nassim Urdu\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; " @@ -3554,7 +3554,7 @@ exports[`should render SerifRegular correctly for amharic 1`] = ` exports[`should render SerifRegular correctly for arabic 1`] = ` " - font-family: \\"BBC Nassim Arabic\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -3730,7 +3730,7 @@ exports[`should render SerifRegular correctly for optimobase 1`] = ` exports[`should render SerifRegular correctly for pashto 1`] = ` " - font-family: \\"BBC Nassim Pashto\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -3738,7 +3738,7 @@ exports[`should render SerifRegular correctly for pashto 1`] = ` exports[`should render SerifRegular correctly for persian 1`] = ` " - font-family: \\"BBC Nassim Persian\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " @@ -3874,7 +3874,7 @@ exports[`should render SerifRegular correctly for ukrainian 1`] = ` exports[`should render SerifRegular correctly for urdu 1`] = ` " - font-family: \\"BBC Nassim Urdu\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; " From a66e120ff98e2b585e079d82e4bb6adb9df5df7b Mon Sep 17 00:00:00 2001 From: Simon Sinclair Date: Wed, 18 Nov 2020 14:48:56 +0000 Subject: [PATCH 08/10] Update font-families snapshots --- .../src/__snapshots__/font-families.test.js.snap | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/utilities/psammead-styles/src/__snapshots__/font-families.test.js.snap b/packages/utilities/psammead-styles/src/__snapshots__/font-families.test.js.snap index d0b1f9e092..a01c0a84e6 100644 --- a/packages/utilities/psammead-styles/src/__snapshots__/font-families.test.js.snap +++ b/packages/utilities/psammead-styles/src/__snapshots__/font-families.test.js.snap @@ -68,12 +68,12 @@ Object { exports[`Psammead Styles - Font Families should match arabic 1`] = ` Object { "sansBold": " - font-family: \\"BBC Nassim Arabic\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; ", "sansRegular": " - font-family: \\"BBC Nassim Arabic\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; ", @@ -713,12 +713,12 @@ Object { exports[`Psammead Styles - Font Families should match pashto 1`] = ` Object { "sansBold": " - font-family: \\"BBC Nassim Pashto\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; ", "sansRegular": " - font-family: \\"BBC Nassim Pashto\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; ", @@ -728,12 +728,12 @@ Object { exports[`Psammead Styles - Font Families should match persian 1`] = ` Object { "sansBold": " - font-family: \\"BBC Nassim Persian\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; ", "sansRegular": " - font-family: \\"BBC Nassim Persian\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; ", @@ -1193,12 +1193,12 @@ Object { exports[`Psammead Styles - Font Families should match urdu 1`] = ` Object { "sansBold": " - font-family: \\"BBC Nassim Urdu\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 700; font-style: normal; ", "sansRegular": " - font-family: \\"BBC Nassim Urdu\\", Arial, Verdana, Geneva, Helvetica, sans-serif; + font-family: \\"BBC Reith Qalam\\", Arial, Verdana, Geneva, Helvetica, sans-serif; font-weight: 400; font-style: normal; ", From 6b7b079fd91da504acf84c63b9f8c959d4a95a64 Mon Sep 17 00:00:00 2001 From: Simon Sinclair Date: Wed, 18 Nov 2020 15:02:36 +0000 Subject: [PATCH 09/10] Update packages/utilities/psammead-styles/CHANGELOG.md --- packages/utilities/psammead-styles/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/utilities/psammead-styles/CHANGELOG.md b/packages/utilities/psammead-styles/CHANGELOG.md index 46dd2540de..26d8375f34 100644 --- a/packages/utilities/psammead-styles/CHANGELOG.md +++ b/packages/utilities/psammead-styles/CHANGELOG.md @@ -3,7 +3,7 @@ | Version | Description | |---------|-------------| -| 7.0.0 | [PR#????](https://github.com/bbc/psammead/pull/????) Replace BBC Nassim with BBC Reith Qalam. | +| 7.0.0 | [PR#4002](https://github.com/bbc/psammead/pull/4002) Replace BBC Nassim with BBC Reith Qalam. | | 6.1.0 | [PR#3942](https://github.com/bbc/psammead/pull/3942) Move @font-face declarations outside of html selector. | | 6.0.1 | [PR#3924](https://github.com/bbc/psammead/pull/3924) Migrate Storybook to Emotion. | | 6.0.0 | [PR#3880](https://github.com/bbc/psammead/pull/3880) Migrate to Emotion. | From 7cebb569c775406d0f50237eca5bfe3a1d2ae2d2 Mon Sep 17 00:00:00 2001 From: Simon Sinclair Date: Wed, 18 Nov 2020 15:17:11 +0000 Subject: [PATCH 10/10] Replace BBC Nassim with BBC Reith Qalam in parent test --- packages/utilities/psammead-styles/index.test.jsx | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/utilities/psammead-styles/index.test.jsx b/packages/utilities/psammead-styles/index.test.jsx index 003b421fe8..1e956f1f3e 100644 --- a/packages/utilities/psammead-styles/index.test.jsx +++ b/packages/utilities/psammead-styles/index.test.jsx @@ -23,14 +23,8 @@ const fontsExpectedExports = { F_REITH_SANS_EXTRA_BOLD_ITALIC: 'function', F_REITH_SANS_CONDENSED_REGULAR: 'function', F_REITH_SANS_CONDENSED_BOLD: 'function', - F_NASSIM_ARABIC_REGULAR: 'function', - F_NASSIM_ARABIC_BOLD: 'function', - F_NASSIM_PASHTO_REGULAR: 'function', - F_NASSIM_PASHTO_BOLD: 'function', - F_NASSIM_PERSIAN_REGULAR: 'function', - F_NASSIM_PERSIAN_BOLD: 'function', - F_NASSIM_URDU_REGULAR: 'function', - F_NASSIM_URDU_BOLD: 'function', + F_REITH_QALAM_REGULAR: 'function', + F_REITH_QALAM_BOLD: 'function', F_ISKOOLA_POTA_BBC_REGULAR: 'function', F_ISKOOLA_POTA_BBC_BOLD: 'function', F_LATHA_REGULAR: 'function',