From 9c366d0cef1daba6a2ef7eac2d139cf81e2bd371 Mon Sep 17 00:00:00 2001 From: jimjohnsonrollings Date: Fri, 8 Jan 2021 09:06:52 +0000 Subject: [PATCH 1/9] Update withServicesKnobs to export colours --- .../psammead-storybook-helpers/src/withServicesKnob.jsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/utilities/psammead-storybook-helpers/src/withServicesKnob.jsx b/packages/utilities/psammead-storybook-helpers/src/withServicesKnob.jsx index 287955d38b..8eaeb7f192 100644 --- a/packages/utilities/psammead-storybook-helpers/src/withServicesKnob.jsx +++ b/packages/utilities/psammead-storybook-helpers/src/withServicesKnob.jsx @@ -35,6 +35,9 @@ export default ({ locale, dir = 'ltr', timezone = 'GMT', + brandBackgroundColour, + brandForegroundColour, + brandBorderColour, } = TEXT_VARIANTS[selectedService]; const storyProps = { @@ -48,6 +51,9 @@ export default ({ variant: variant || 'default', selectedService, timezone, + brandBackgroundColour, + brandForegroundColour, + brandBorderColour, }; return ( From 5ae978687b04cdf118458784ffd54281926066ee Mon Sep 17 00:00:00 2001 From: jimjohnsonrollings Date: Fri, 8 Jan 2021 09:10:19 +0000 Subject: [PATCH 2/9] Update tests --- .../src/withServicesKnob.test.jsx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/utilities/psammead-storybook-helpers/src/withServicesKnob.test.jsx b/packages/utilities/psammead-storybook-helpers/src/withServicesKnob.test.jsx index 894d8cced6..d863275472 100644 --- a/packages/utilities/psammead-storybook-helpers/src/withServicesKnob.test.jsx +++ b/packages/utilities/psammead-storybook-helpers/src/withServicesKnob.test.jsx @@ -65,6 +65,9 @@ it('should pass the correct props to the story function', () => { script: latin, service: 'news', articlePath: '/news/articles/cn7k01xp8kxo', + brandBackgroundColour: '#B80000', + brandBorderColour: '#EAB3B3', + brandForegroundColour: '#FFFFFF', text: 'Could a computer ever create better art than a human?', longText: 'The critic, author, poet and TV host was known for his witty commentary on international television.', @@ -88,6 +91,9 @@ it('should pass the correct chosen service props to the story function', () => { script: arabic, service: 'arabic', articlePath: '/arabic/articles/c1er5mjnznzo', + brandBackgroundColour: '#B80000', + brandBorderColour: '#EAB3B3', + brandForegroundColour: '#FFFFFF', text: 'لماذا يخجل البعض من اسم قريته في مصر؟', longText: 'هناك وقائع عدة تتسم بالسخرية والجدل والتنمر، ضد أهل القرية الذين أصابهم الغضب والسخط مما دفعهم إلى تقديم طلب لتغيير اسم قريتهم.', @@ -111,6 +117,9 @@ it('should pass the correct chosen service props to the story function', () => { script: chinese, service: 'ukchina', articlePath: '/ukchina/articles/c0e8weny66ko/simp', + brandBackgroundColour: '#B80000', + brandBorderColour: '#EAB3B3', + brandForegroundColour: '#FFFFFF', text: '该计划的批评者说，这个政策不能解决住房短缺的问题', longText: '但在当今世界，尽管许多人已不再把步行作为一种主要的出行方式，但巴黎仍然是属于孤僻、哲学式观察者的理想城市。毕竟，法国人习惯于花时间以文学和哲学的方式观察和思考周围的环境', From d3e44fda55208f13879e7950e82bc05c3f2b0554 Mon Sep 17 00:00:00 2001 From: jimjohnsonrollings Date: Fri, 8 Jan 2021 09:15:19 +0000 Subject: [PATCH 3/9] Bump version --- packages/utilities/psammead-storybook-helpers/CHANGELOG.md | 1 + packages/utilities/psammead-storybook-helpers/package-lock.json | 2 +- packages/utilities/psammead-storybook-helpers/package.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/utilities/psammead-storybook-helpers/CHANGELOG.md b/packages/utilities/psammead-storybook-helpers/CHANGELOG.md index d8e2d17e17..bbece7d85a 100644 --- a/packages/utilities/psammead-storybook-helpers/CHANGELOG.md +++ b/packages/utilities/psammead-storybook-helpers/CHANGELOG.md @@ -3,6 +3,7 @@ | Version | Description | |---------|-------------| +| 9.0.7 | [PR#4203](https://github.com/bbc/psammead/pull/4203) Adds service brand colours to service knob exports | | 9.0.6 | [PR#4190](https://github.com/bbc/psammead/pull/4190) Add brand colours and services in text-variants | | 9.0.5 | [PR#4191](https://github.com/bbc/psammead/pull/4191) remove use of deprecated waitForDomChange | | 9.0.4 | [PR#4052](https://github.com/bbc/psammead/pull/4052) Talos - Bump Dependencies - @bbc/gel-foundations | diff --git a/packages/utilities/psammead-storybook-helpers/package-lock.json b/packages/utilities/psammead-storybook-helpers/package-lock.json index f53e8cdd55..82218f920c 100644 --- a/packages/utilities/psammead-storybook-helpers/package-lock.json +++ b/packages/utilities/psammead-storybook-helpers/package-lock.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-storybook-helpers", - "version": "9.0.6", + "version": "9.0.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/utilities/psammead-storybook-helpers/package.json b/packages/utilities/psammead-storybook-helpers/package.json index 7e0d998b91..0e26732f6d 100644 --- a/packages/utilities/psammead-storybook-helpers/package.json +++ b/packages/utilities/psammead-storybook-helpers/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-storybook-helpers", - "version": "9.0.6", + "version": "9.0.7", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, From e232a7161fbbcffa9c66b203bf564991f560278f Mon Sep 17 00:00:00 2001 From: jimjohnsonrollings Date: Fri, 8 Jan 2021 11:51:28 +0000 Subject: [PATCH 4/9] Add a brand highlight colour too --- .../psammead-storybook-helpers/CHANGELOG.md | 2 +- .../src/text-variants.js | 53 ++++++++++++++++++- .../src/withServicesKnob.jsx | 2 + .../src/withServicesKnob.test.jsx | 9 ++-- 4 files changed, 61 insertions(+), 5 deletions(-) diff --git a/packages/utilities/psammead-storybook-helpers/CHANGELOG.md b/packages/utilities/psammead-storybook-helpers/CHANGELOG.md index bbece7d85a..bc2e701b13 100644 --- a/packages/utilities/psammead-storybook-helpers/CHANGELOG.md +++ b/packages/utilities/psammead-storybook-helpers/CHANGELOG.md @@ -3,7 +3,7 @@ | Version | Description | |---------|-------------| -| 9.0.7 | [PR#4203](https://github.com/bbc/psammead/pull/4203) Adds service brand colours to service knob exports | +| 9.0.7 | [PR#4203](https://github.com/bbc/psammead/pull/4203) Adds another brand colour to service knob and export the colours | | 9.0.6 | [PR#4190](https://github.com/bbc/psammead/pull/4190) Add brand colours and services in text-variants | | 9.0.5 | [PR#4191](https://github.com/bbc/psammead/pull/4191) remove use of deprecated waitForDomChange | | 9.0.4 | [PR#4052](https://github.com/bbc/psammead/pull/4052) Talos - Bump Dependencies - @bbc/gel-foundations | diff --git a/packages/utilities/psammead-storybook-helpers/src/text-variants.js b/packages/utilities/psammead-storybook-helpers/src/text-variants.js index 045fc8e691..3cefc028f9 100644 --- a/packages/utilities/psammead-storybook-helpers/src/text-variants.js +++ b/packages/utilities/psammead-storybook-helpers/src/text-variants.js @@ -1,6 +1,7 @@ const DEFAULT_BRAND_BACKGROUND_COLOUR = '#B80000'; -const DEFAULT_BRAND_FORGROUND_COLOUR = '#FFFFFF'; +const DEFAULT_BRAND_FORGROUND_COLOUR = '#FDFDFD'; const DEFAULT_BRAND_BORDER_COLOUR = '#EAB3B3'; +const DEFAULT_BRAND_HIGHLIGHT_COLOUR = '#FFFFFF'; const TEXT_VARIANTS = { afaanoromoo: { @@ -14,6 +15,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, afrique: { text: "La femme qui s'est volatilisée après avoir arnaqué le monde", @@ -26,6 +28,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, amharic: { text: 'እንግሊዝ ከሩስያ ጦርነት ከገጠመች ከጦር መሣሪያ ውጭ ትሆናለች', @@ -38,6 +41,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, arabic: { text: 'لماذا يخجل البعض من اسم قريته في مصر؟', @@ -51,6 +55,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, azeri: { text: 'Azərbaycanın siyasi ailələrinin ikinci evi – İngiltərə', @@ -63,6 +68,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, bengali: { text: 'ভিসা ফুরিয়ে যাওয়ায় ক্রিকেটার সাইফের জরিমানা', @@ -75,6 +81,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, burmese: { text: 'အောက်စဖို့ဒ် ဆရာတော် ပါမောက္ခ ဒေါက်တာအရှင်ဓမ္မသာမိ', @@ -87,6 +94,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, cymrufyw: { text: 'Prif hyfforddwr y Gleision yn gadael y rhanbarth', @@ -99,6 +107,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, gahuza: { text: "Umukate n'isoda vyatumye amenya ko afise umugera wa SIDA", @@ -111,6 +120,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, gujarati: { text: 'જીતેન્દ્રસિંહ મૂળ ઉત્તર પ્રદેશના ફિરોઝાબાદના', @@ -123,6 +133,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, hausa: { text: 'Bayanin Ganduje kan ayyukan Gama', @@ -135,6 +146,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, hindi: { text: 'भारतीय खाने पर दुनिया में क्यों छिड़ी बहस', @@ -147,6 +159,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, igbo: { text: 'Etu e si achụ nwaanyị taa na mgbe gboo', @@ -159,6 +172,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, indonesia: { text: @@ -172,6 +186,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, japanese: { text: '度目の採決認めなかった理由は', @@ -184,6 +199,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, korean: { text: '마이크 폼페이오 미국 국무장관', @@ -196,6 +212,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, kyrgyz: { text: 'Казакстан Назарбаевден башка президентти көрө', @@ -208,6 +225,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, marathi: { text: 'तो फोटो मुंबईकर आजही विसरू शकलेले नाहीत.', @@ -220,6 +238,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, mundo: { text: 'Lo que todos podemos aprender de esta foto de un hombre', @@ -232,6 +251,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, naidheachdan: { text: 'Bana-chroitear òg sna Hearadh agus an turas sònraichte aice', @@ -244,6 +264,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, nepali: { text: "नेपाललाई तीनवटा जलमार्ग प्रयोग गर्न दिन भारत 'सहमत", @@ -256,6 +277,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, news: { text: 'Could a computer ever create better art than a human?', @@ -268,6 +290,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, newsround: { text: 'Could a computer ever create better art than a human?', @@ -280,6 +303,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: '#6C22D6', brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: '#9159A8', + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, optimobase: { text: 'Could a computer ever create better art than a human?', @@ -292,6 +316,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, pashto: { text: @@ -306,6 +331,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, persian: { text: @@ -320,6 +346,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, pidgin: { text: 'Tins you need to know about Babcock University', @@ -332,6 +359,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, portuguese: { text: 'Como dormir melhor (e em menos tempo)', @@ -344,6 +372,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, punjabi: { text: 'ਲਾਲ ਰਾਜਮਾਂਹ ਤੇ ਸੋਇਆਬੀਨ ਸਣੇ ਖਾਣ ਦੀਆਂ 5 ‘ਖ਼ਤਰਨਾਕ’ ਚੀਜ਼ਾਂ', @@ -356,6 +385,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, russian: { text: 'Последняя воля: чем тронуло мир фото умирающего американца?', @@ -368,6 +398,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, serbianCyr: { service: 'serbian', @@ -382,6 +413,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, serbianLat: { service: 'serbian', @@ -396,6 +428,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, sinhala: { text: 'සිවිල් යුද ගැටුම් හමුවේ කොටු වී සිටි සිවිල් වැසියන්', @@ -408,6 +441,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, somali: { text: @@ -421,6 +455,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, sport: { text: 'Could a computer ever create better art than a human?', @@ -433,6 +468,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: '#FFD230', brandForegroundColour: '#000000', brandBorderColour: '#FCDF69', + brandHighlightColour: '#000000', }, swahili: { text: 'Tetesi za soka Ulaya Jumatano tarehe 27.11.2019', @@ -445,6 +481,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, tamil: { text: @@ -458,6 +495,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, telugu: { text: @@ -471,6 +509,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, thai: { text: 'ภาพวาดของตำรวจจากใบหน้าผู้เสียชีวิต', @@ -483,6 +522,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, tigrinya: { text: 'ዓብዱራሕማን ኣቡሃሽም ሰሜናዊ ቀይሕ', @@ -495,6 +535,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, turkce: { text: "Dünyanın ilk HIV-pozitif sperm bankası Yeni Zelanda'da açıldı", @@ -507,6 +548,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, ukchinaSimp: { service: 'ukchina', @@ -521,6 +563,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, ukchinaTrad: { service: 'ukchina', @@ -535,6 +578,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, ukrainian: { text: @@ -548,6 +592,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, urdu: { text: 'وزیراعظم ریٹائرڈ جرنیل کو فوج کا سربراہ مقرر کر سکتے ہیں', @@ -561,6 +606,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, uzbek: { text: @@ -574,6 +620,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, vietnamese: { text: 'Ông Nazarbayev bất ngờ tuyên bố từ chức hôm 19/3/2019', @@ -586,6 +633,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, yoruba: { text: 'Wo àwọn òrílẹ̀ èdè Mẹ́wàá tó láyọ̀ jùlọ Lágbàyé', @@ -598,6 +646,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, zhongwenSimp: { service: 'zhongwen', @@ -612,6 +661,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, zhongwenTrad: { service: 'zhongwen', @@ -626,6 +676,7 @@ const TEXT_VARIANTS = { brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, + brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, }; diff --git a/packages/utilities/psammead-storybook-helpers/src/withServicesKnob.jsx b/packages/utilities/psammead-storybook-helpers/src/withServicesKnob.jsx index 8eaeb7f192..8837af6c47 100644 --- a/packages/utilities/psammead-storybook-helpers/src/withServicesKnob.jsx +++ b/packages/utilities/psammead-storybook-helpers/src/withServicesKnob.jsx @@ -38,6 +38,7 @@ export default ({ brandBackgroundColour, brandForegroundColour, brandBorderColour, + brandHighlightColour, } = TEXT_VARIANTS[selectedService]; const storyProps = { @@ -54,6 +55,7 @@ export default ({ brandBackgroundColour, brandForegroundColour, brandBorderColour, + brandHighlightColour, }; return ( diff --git a/packages/utilities/psammead-storybook-helpers/src/withServicesKnob.test.jsx b/packages/utilities/psammead-storybook-helpers/src/withServicesKnob.test.jsx index d863275472..1ff7d5117a 100644 --- a/packages/utilities/psammead-storybook-helpers/src/withServicesKnob.test.jsx +++ b/packages/utilities/psammead-storybook-helpers/src/withServicesKnob.test.jsx @@ -67,7 +67,8 @@ it('should pass the correct props to the story function', () => { articlePath: '/news/articles/cn7k01xp8kxo', brandBackgroundColour: '#B80000', brandBorderColour: '#EAB3B3', - brandForegroundColour: '#FFFFFF', + brandForegroundColour: '#FDFDFD', + brandHighlightColour: '#FFFFFF', text: 'Could a computer ever create better art than a human?', longText: 'The critic, author, poet and TV host was known for his witty commentary on international television.', @@ -93,7 +94,8 @@ it('should pass the correct chosen service props to the story function', () => { articlePath: '/arabic/articles/c1er5mjnznzo', brandBackgroundColour: '#B80000', brandBorderColour: '#EAB3B3', - brandForegroundColour: '#FFFFFF', + brandForegroundColour: '#FDFDFD', + brandHighlightColour: '#FFFFFF', text: 'لماذا يخجل البعض من اسم قريته في مصر؟', longText: 'هناك وقائع عدة تتسم بالسخرية والجدل والتنمر، ضد أهل القرية الذين أصابهم الغضب والسخط مما دفعهم إلى تقديم طلب لتغيير اسم قريتهم.', @@ -119,7 +121,8 @@ it('should pass the correct chosen service props to the story function', () => { articlePath: '/ukchina/articles/c0e8weny66ko/simp', brandBackgroundColour: '#B80000', brandBorderColour: '#EAB3B3', - brandForegroundColour: '#FFFFFF', + brandForegroundColour: '#FDFDFD', + brandHighlightColour: '#FFFFFF', text: '该计划的批评者说，这个政策不能解决住房短缺的问题', longText: '但在当今世界，尽管许多人已不再把步行作为一种主要的出行方式，但巴黎仍然是属于孤僻、哲学式观察者的理想城市。毕竟，法国人习惯于花时间以文学和哲学的方式观察和思考周围的环境', From 9a606e97385f2efc00a41ab9e414c832b403e46a Mon Sep 17 00:00:00 2001 From: jimjohnsonrollings Date: Fri, 8 Jan 2021 12:01:02 +0000 Subject: [PATCH 5/9] Correct the spelling of Foreground --- .../src/text-variants.js | 100 +++++++++--------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/packages/utilities/psammead-storybook-helpers/src/text-variants.js b/packages/utilities/psammead-storybook-helpers/src/text-variants.js index 3cefc028f9..13c6e443eb 100644 --- a/packages/utilities/psammead-storybook-helpers/src/text-variants.js +++ b/packages/utilities/psammead-storybook-helpers/src/text-variants.js @@ -1,5 +1,5 @@ const DEFAULT_BRAND_BACKGROUND_COLOUR = '#B80000'; -const DEFAULT_BRAND_FORGROUND_COLOUR = '#FDFDFD'; +const DEFAULT_BRAND_FOREGROUND_COLOUR = '#FDFDFD'; const DEFAULT_BRAND_BORDER_COLOUR = '#EAB3B3'; const DEFAULT_BRAND_HIGHLIGHT_COLOUR = '#FFFFFF'; @@ -13,7 +13,7 @@ const TEXT_VARIANTS = { timezone: 'Africa/Addis_Ababa', articlePath: '/afaanoromoo/articles/c4g19kgl85ko', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -26,7 +26,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/afrique/articles/cz216x22106o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -39,7 +39,7 @@ const TEXT_VARIANTS = { timezone: 'Africa/Addis_Ababa', articlePath: '/amharic/articles/c3rykrrvy19o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -53,7 +53,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/arabic/articles/c1er5mjnznzo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -66,7 +66,7 @@ const TEXT_VARIANTS = { timezone: 'Asia/Baku', articlePath: '/azeri/articles/c5k08pqnzexo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -79,7 +79,7 @@ const TEXT_VARIANTS = { timezone: 'Asia/Dhaka', articlePath: '/bengali/articles/c6p3yp5zzmeo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -92,7 +92,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/burmese/articles/c3w1kwwmm5yo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -105,7 +105,7 @@ const TEXT_VARIANTS = { timezone: 'Europe/London', articlePath: '/cymrufyw/articles/cn7k01xp8kxo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -118,7 +118,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/gahuza/articles/cey23zx8wx8o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -131,7 +131,7 @@ const TEXT_VARIANTS = { timezone: 'Asia/Kolkata', articlePath: '/gujarati/articles/cr5el5kw591o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -144,7 +144,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/hausa/articles/c2nr6xqmnewo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -157,7 +157,7 @@ const TEXT_VARIANTS = { timezone: 'Asia/Kolkata', articlePath: '/hindi/articles/c0469479x9xo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -170,7 +170,7 @@ const TEXT_VARIANTS = { timezone: 'Africa/Lagos', articlePath: '/igbo/articles/cr1lw620ygjo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -184,7 +184,7 @@ const TEXT_VARIANTS = { timezone: 'Asia/Jakarta', articlePath: '/indonesia/articles/c0q2zq8pzvzo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -197,7 +197,7 @@ const TEXT_VARIANTS = { timezone: 'Asia/Tokyo', articlePath: '/japanese/articles/c693w95w0mko', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -210,7 +210,7 @@ const TEXT_VARIANTS = { timezone: 'Asia/Seoul', articlePath: '/korean/articles/cpv9kv2yzk6o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -223,7 +223,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/kyrgyz/articles/c3xd4xg3rm9o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -236,7 +236,7 @@ const TEXT_VARIANTS = { timezone: 'Asia/Kolkata', articlePath: '/marathi/articles/cp47g4myxz7o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -249,7 +249,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/mundo/articles/ce42wzqr2mko', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -262,7 +262,7 @@ const TEXT_VARIANTS = { timezone: 'Europe/London', articlePath: '/naidheachdan/articles/cn7k01xp8kxo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -275,7 +275,7 @@ const TEXT_VARIANTS = { timezone: 'Asia/Kathmandu', articlePath: '/nepali/articles/cl90j9m3mn6o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -288,7 +288,7 @@ const TEXT_VARIANTS = { timezone: 'Europe/London', articlePath: '/news/articles/cn7k01xp8kxo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -301,7 +301,7 @@ const TEXT_VARIANTS = { timezone: 'Europe/London', articlePath: '/newsround/articles/cn7k01xp8kxo', brandBackgroundColour: '#6C22D6', - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: '#9159A8', brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -314,7 +314,7 @@ const TEXT_VARIANTS = { timezone: 'Europe/London', articlePath: '/optimobase/articles/cn7k01xp8kxo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -329,7 +329,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/pashto/articles/cyjmdl92z3ro', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -344,7 +344,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/persian/articles/cej3lzd5e0go', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -357,7 +357,7 @@ const TEXT_VARIANTS = { timezone: 'Africa/Lagos', articlePath: '/pidgin/articles/cwl08rd38l6o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -370,7 +370,7 @@ const TEXT_VARIANTS = { timezone: 'America/Sao_Paulo', articlePath: '/portuguese/articles/cd61pm8gzmpo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -383,7 +383,7 @@ const TEXT_VARIANTS = { timezone: 'Asia/Kolkata', articlePath: '/punjabi/articles/c0l79lr39qyo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -396,7 +396,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/russian/articles/ck7pz7re3zgo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -411,7 +411,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/serbian/articles/c805k05kr73o/cyr', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -426,7 +426,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/serbian/articles/c805k05kr73o/lat', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -439,7 +439,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/sinhala/articles/c45w255zlexo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -453,7 +453,7 @@ const TEXT_VARIANTS = { timezone: 'Africa/Mogadishu', articlePath: '/somali/articles/cgn6emk3jm8o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -479,7 +479,7 @@ const TEXT_VARIANTS = { timezone: 'Africa/Nairobi', articlePath: '/swahili/articles/czjqge2jwn2o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -493,7 +493,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/tamil/articles/cwl08ll3me8o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -507,7 +507,7 @@ const TEXT_VARIANTS = { timezone: 'Asia/Kolkata', articlePath: '/telugu/articles/cq0y4008d4vo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -520,7 +520,7 @@ const TEXT_VARIANTS = { timezone: 'Asia/Bangkok', articlePath: '/thai/articles/c3qxeqm7ldjo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -533,7 +533,7 @@ const TEXT_VARIANTS = { timezone: 'Africa/Addis_Ababa', articlePath: '/tigrinya/articles/c12g32eldk6o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -546,7 +546,7 @@ const TEXT_VARIANTS = { timezone: 'Asia/Istanbul', articlePath: '/turkce/articles/c8q1ze59n25o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -561,7 +561,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/ukchina/articles/c0e8weny66ko/simp', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -576,7 +576,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/ukchina/articles/c0e8weny66ko/trad', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -590,7 +590,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/ukrainian/articles/c0glz45kqz6o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -604,7 +604,7 @@ const TEXT_VARIANTS = { timezone: 'Asia/Karachi', articlePath: '/urdu/articles/cwgq7rzv172o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -618,7 +618,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/uzbek/articles/cxj3rjxm6r0o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -631,7 +631,7 @@ const TEXT_VARIANTS = { timezone: 'Asia/Ho_Chi_Minh', articlePath: '/vietnamese/articles/c3y59g5zm19o', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -644,7 +644,7 @@ const TEXT_VARIANTS = { timezone: 'Africa/Lagos', articlePath: '/yoruba/articles/clw06m0nj8qo', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -659,7 +659,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/zhongwen/articles/c3xd4x9prgyo/simp', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, @@ -674,7 +674,7 @@ const TEXT_VARIANTS = { timezone: 'GMT', articlePath: '/zhongwen/articles/c3xd4x9prgyo/trad', brandBackgroundColour: DEFAULT_BRAND_BACKGROUND_COLOUR, - brandForegroundColour: DEFAULT_BRAND_FORGROUND_COLOUR, + brandForegroundColour: DEFAULT_BRAND_FOREGROUND_COLOUR, brandBorderColour: DEFAULT_BRAND_BORDER_COLOUR, brandHighlightColour: DEFAULT_BRAND_HIGHLIGHT_COLOUR, }, From 064b0a4072e888ce8cba791ec6367b3569d84a33 Mon Sep 17 00:00:00 2001 From: jimjohnsonrollings Date: Fri, 8 Jan 2021 12:38:22 +0000 Subject: [PATCH 6/9] Update sport colours --- .../utilities/psammead-storybook-helpers/src/text-variants.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/utilities/psammead-storybook-helpers/src/text-variants.js b/packages/utilities/psammead-storybook-helpers/src/text-variants.js index 13c6e443eb..bf7d604b98 100644 --- a/packages/utilities/psammead-storybook-helpers/src/text-variants.js +++ b/packages/utilities/psammead-storybook-helpers/src/text-variants.js @@ -466,8 +466,8 @@ const TEXT_VARIANTS = { timezone: 'Europe/London', articlePath: '/sport/articles/cn7k01xp8kxo', brandBackgroundColour: '#FFD230', - brandForegroundColour: '#000000', - brandBorderColour: '#FCDF69', + brandForegroundColour: '#121212', + brandBorderColour: '#BB9A31', brandHighlightColour: '#000000', }, swahili: { From 41312e3b7e30b1cf56bb129c83aaaeba1e11ee87 Mon Sep 17 00:00:00 2001 From: simorgh-bbc Date: Mon, 11 Jan 2021 09:28:18 +0000 Subject: [PATCH 7/9] Talos - Bump Dependencies --- package-lock.json | 8 ++++---- package.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index e595e346b4..60edee216a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead", - "version": "4.0.57", + "version": "4.0.58", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1964,9 +1964,9 @@ } }, "@bbc/psammead-storybook-helpers": { - "version": "9.0.6", - "resolved": "https://registry.npmjs.org/@bbc/psammead-storybook-helpers/-/psammead-storybook-helpers-9.0.6.tgz", - "integrity": "sha512-91CC9fXQrYy3CCRhE5YMuOnwru6X9JdB5rUbDgJR+N52SZlYgCZhi/XghfKZbTgH4c3rBKOk07tqEL12cV/5Tw==", + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/@bbc/psammead-storybook-helpers/-/psammead-storybook-helpers-9.0.7.tgz", + "integrity": "sha512-SppUzTQh9MYz4ifZ2XUQ/hgI1UPD5M4KOq024LKLdsw04/JlbzCsyPC0KXLYoeAGm6yt9xFUFGmPreIcUZyGKA==", "dev": true, "requires": { "@bbc/gel-foundations": "^6.0.0", diff --git a/package.json b/package.json index 7c279262ab..4eecb1458e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead", - "version": "4.0.57", + "version": "4.0.58", "description": "Core Components Library Developed & Maintained By The Articles and Reach & Languages Team", "main": "index.js", "private": true, @@ -96,7 +96,7 @@ "@bbc/psammead-social-embed": "^3.1.3", "@bbc/psammead-story-promo": "^8.0.8", "@bbc/psammead-story-promo-list": "^6.0.6", - "@bbc/psammead-storybook-helpers": "^9.0.6", + "@bbc/psammead-storybook-helpers": "^9.0.7", "@bbc/psammead-styles": "^7.0.2", "@bbc/psammead-test-helpers": "^5.0.1", "@bbc/psammead-timestamp": "^4.0.7", From 6679c904e4ccd3a19655e93e84b864bfaa76bf4b Mon Sep 17 00:00:00 2001 From: simorgh-bbc Date: Mon, 11 Jan 2021 09:28:24 +0000 Subject: [PATCH 8/9] Talos - Update changelogs --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 357b3a43c4..0ae491ae7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ | Version | Description | |---------|-------------| +| 4.0.58 | [PR#4211](https://github.com/bbc/psammead/pull/4211) Talos - Bump Dependencies - @bbc/psammead-storybook-helpers | | 4.0.57 | [PR#4198](https://github.com/bbc/psammead/pull/4198) Talos - Bump Dependencies - @bbc/psammead-brand, @bbc/psammead-bulletin, @bbc/psammead-episode-list, @bbc/psammead-media-player, @bbc/psammead-most-read, @bbc/psammead-radio-schedule, @bbc/psammead-timestamp-container | | 4.0.56 | [PR#4199](https://github.com/bbc/psammead/pull/4199) Talos - Bump Dependencies - @bbc/psammead-storybook-helpers | | 4.0.55 | [PR#4197](https://github.com/bbc/psammead/pull/4197) Talos - Bump Dependencies - @bbc/psammead-brand, @bbc/psammead-bulleted-list, @bbc/psammead-bulletin, @bbc/psammead-byline, @bbc/psammead-caption, @bbc/psammead-consent-banner, @bbc/psammead-copyright, @bbc/psammead-embed-error, @bbc/psammead-episode-list, @bbc/psammead-grid, @bbc/psammead-heading-index, @bbc/psammead-headings, @bbc/psammead-image-placeholder, @bbc/psammead-inline-link, @bbc/psammead-live-label, @bbc/psammead-media-player, @bbc/psammead-media-indicator, @bbc/psammead-most-read, @bbc/psammead-navigation, @bbc/psammead-paragraph, @bbc/psammead-play-button, @bbc/psammead-radio-schedule, @bbc/psammead-script-link, @bbc/psammead-section-label, @bbc/psammead-sitewide-links, @bbc/psammead-social-embed, @bbc/psammead-story-promo, @bbc/psammead-story-promo-list, @bbc/psammead-timestamp, @bbc/psammead-useful-links | From 8abe03a3e6f037c1dd3945310cea3021cfcbfd66 Mon Sep 17 00:00:00 2001 From: jimjohnsonrollings Date: Mon, 11 Jan 2021 09:59:22 +0000 Subject: [PATCH 9/9] trigger ci