From d40ac274e4398468f975b670c61a56128a29b398 Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Wed, 6 Nov 2019 11:44:28 +0000 Subject: [PATCH 1/6] Explicitly set the disply and font-weight styles for

--- packages/components/psammead-headings/CHANGELOG.md | 1 + packages/components/psammead-headings/package-lock.json | 2 +- packages/components/psammead-headings/package.json | 2 +- packages/components/psammead-headings/src/index.jsx | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/components/psammead-headings/CHANGELOG.md b/packages/components/psammead-headings/CHANGELOG.md index 1ecd54255e..b4165578d0 100644 --- a/packages/components/psammead-headings/CHANGELOG.md +++ b/packages/components/psammead-headings/CHANGELOG.md @@ -3,6 +3,7 @@ | Version | Description | |---------|-------------| +| 3.1.19 | [PR#xxxx](https://github.com/bbc/psammead/pull/xxxx) Explicitly set `display` and `font-weight` styles rather than rely on browser default for

| | 3.1.18 | [PR#2519](https://github.com/bbc/psammead/pull/2519) Talos - Bump Dependencies - @bbc/psammead-styles | | 3.1.17 | [PR#2488](https://github.com/bbc/psammead/pull/2488) Talos - Bump Dependencies - @bbc/gel-foundations | | 3.1.16 | [PR#2477](https://github.com/bbc/psammead/pull/2477) Talos - Bump Dependencies - @bbc/psammead-styles | diff --git a/packages/components/psammead-headings/package-lock.json b/packages/components/psammead-headings/package-lock.json index 420994b130..53f3996321 100644 --- a/packages/components/psammead-headings/package-lock.json +++ b/packages/components/psammead-headings/package-lock.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-headings", - "version": "3.1.18", + "version": "3.1.19", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/components/psammead-headings/package.json b/packages/components/psammead-headings/package.json index 147ce6a98a..b1d6e8a03c 100644 --- a/packages/components/psammead-headings/package.json +++ b/packages/components/psammead-headings/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-headings", - "version": "3.1.18", + "version": "3.1.19", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, diff --git a/packages/components/psammead-headings/src/index.jsx b/packages/components/psammead-headings/src/index.jsx index 3626c5d37a..b7a49f569d 100644 --- a/packages/components/psammead-headings/src/index.jsx +++ b/packages/components/psammead-headings/src/index.jsx @@ -14,6 +14,8 @@ export const Headline = styled.h1` ${({ script }) => script && getCanon(script)}; ${({ service }) => getSerifMedium(service)} color: ${C_SHADOW}; + display: block; /* Explicitly set */ + font-weight: 500; /* Explicitly set */ margin: 0; /* Reset */ padding: ${GEL_SPACING_QUAD} 0; ${MEDIA_QUERY_TYPOGRAPHY.LAPTOP_AND_LARGER} { From ed0b44bcc005802f808a067b5b99864add3d7642 Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Wed, 6 Nov 2019 11:49:42 +0000 Subject: [PATCH 2/6] snapshot update --- .../psammead-headings/src/__snapshots__/index.test.jsx.snap | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/components/psammead-headings/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-headings/src/__snapshots__/index.test.jsx.snap index b4e2d8f11e..448d039883 100644 --- a/packages/components/psammead-headings/src/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-headings/src/__snapshots__/index.test.jsx.snap @@ -8,6 +8,8 @@ exports[`Headline component should render correctly 1`] = ` font-weight: 500; font-style: normal; color: #3F3F42; + display: block; + font-weight: 500; margin: 0; padding: 2rem 0; } @@ -47,6 +49,8 @@ exports[`Headline component should render correctly with arabic script typograph font-weight: 700; font-style: normal; color: #3F3F42; + display: block; + font-weight: 500; margin: 0; padding: 2rem 0; } From abf6d8c30bac3c0849f9da59db61614628387ff4 Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Wed, 6 Nov 2019 15:54:02 +0000 Subject: [PATCH 3/6] PR number --- packages/components/psammead-headings/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/psammead-headings/CHANGELOG.md b/packages/components/psammead-headings/CHANGELOG.md index b4165578d0..8e3eb24667 100644 --- a/packages/components/psammead-headings/CHANGELOG.md +++ b/packages/components/psammead-headings/CHANGELOG.md @@ -3,7 +3,7 @@ | Version | Description | |---------|-------------| -| 3.1.19 | [PR#xxxx](https://github.com/bbc/psammead/pull/xxxx) Explicitly set `display` and `font-weight` styles rather than rely on browser default for

| +| 3.1.19 | [PR#2575](https://github.com/bbc/psammead/pull/2575) Explicitly set `display` and `font-weight` styles rather than rely on browser default for

| | 3.1.18 | [PR#2519](https://github.com/bbc/psammead/pull/2519) Talos - Bump Dependencies - @bbc/psammead-styles | | 3.1.17 | [PR#2488](https://github.com/bbc/psammead/pull/2488) Talos - Bump Dependencies - @bbc/gel-foundations | | 3.1.16 | [PR#2477](https://github.com/bbc/psammead/pull/2477) Talos - Bump Dependencies - @bbc/psammead-styles | From 782e2515c6249a97f52be8e2e00c26b3121f8156 Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Wed, 6 Nov 2019 16:10:44 +0000 Subject: [PATCH 4/6] snapshots --- .../__snapshots__/index.test.jsx.snap | 27 +------- .../__snapshots__/index.test.jsx.snap | 61 ++++++------------- .../src/__snapshots__/index.test.jsx.snap | 61 ++++++------------- 3 files changed, 43 insertions(+), 106 deletions(-) diff --git a/packages/components/psammead-media-player/src/Guidance/__snapshots__/index.test.jsx.snap b/packages/components/psammead-media-player/src/Guidance/__snapshots__/index.test.jsx.snap index 85c6cd11b2..11dde90b70 100644 --- a/packages/components/psammead-media-player/src/Guidance/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-media-player/src/Guidance/__snapshots__/index.test.jsx.snap @@ -1,15 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Media Player: Guidance should render Guidance 1`] = ` -.c4 { - vertical-align: middle; - margin: 0 0.25rem; - color: #222222; - fill: currentColor; - width: 1rem; - height: 1rem; -} - .c0 { font-family: ReithSans,Helvetica,Arial,sans-serif; font-weight: 400; @@ -38,7 +29,7 @@ exports[`Media Player: Guidance should render Guidance 1`] = ` padding: 1rem; } -.c5 { +.c4 { padding-left: 0.25rem; font-weight: normal; } @@ -68,21 +59,9 @@ exports[`Media Player: Guidance should render Guidance 1`] = ` + /> Guidance: Contains strong language with adult humor diff --git a/packages/components/psammead-media-player/src/Placeholder/__snapshots__/index.test.jsx.snap b/packages/components/psammead-media-player/src/Placeholder/__snapshots__/index.test.jsx.snap index d6c6bba979..2e847ea039 100644 --- a/packages/components/psammead-media-player/src/Placeholder/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-media-player/src/Placeholder/__snapshots__/index.test.jsx.snap @@ -129,13 +129,13 @@ exports[`Media Player: Placeholder should render a video placeholder 1`] = ` `; exports[`Media Player: Placeholder should render a video placeholder with guidance 1`] = ` -.c14 { +.c13 { display: block; width: 100%; visibility: visible; } -.c12 { +.c11 { vertical-align: middle; margin: 0 0.25rem; color: #222222; @@ -144,16 +144,7 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan height: 0.75rem; } -.c6 { - vertical-align: middle; - margin: 0 0.25rem; - color: #222222; - fill: currentColor; - width: 1rem; - height: 1rem; -} - -.c10 { +.c9 { -webkit-clip-path: inset(100%); clip-path: inset(100%); -webkit-clip: rect(1px,1px,1px,1px); @@ -165,7 +156,7 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan margin: 0; } -.c8 { +.c7 { background-color: #222222; border: none; color: #FFFFFF; @@ -183,14 +174,14 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan width: 5rem; } -.c8:hover, -.c8:focus { +.c7:hover, +.c7:focus { background-color: #B80000; -webkit-transition: background-color 300ms; transition: background-color 300ms; } -.c11 > svg { +.c10 > svg { color: #FFFFFF; fill: currentColor; height: 1.5rem; @@ -198,7 +189,7 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan width: 1.5rem; } -.c13 { +.c12 { display: block; margin-top: 0.5rem; } @@ -231,7 +222,7 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan padding: 1rem; } -.c7 { +.c6 { padding-left: 0.25rem; font-weight: normal; } @@ -252,13 +243,13 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan height: 100%; } -.c9 { +.c8 { position: absolute; bottom: 0; } -.c0:hover .c9, -.c0:focus .c9 { +.c0:hover .c8, +.c0:focus .c8 { background-color: #B80000; } @@ -283,21 +274,9 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan + /> Guidance: May contain strong language, sexual or violent content that may offend. @@ -305,19 +284,19 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan diff --git a/packages/components/psammead-media-player/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-media-player/src/__snapshots__/index.test.jsx.snap index 5c8958185f..64ed2ab1eb 100644 --- a/packages/components/psammead-media-player/src/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-media-player/src/__snapshots__/index.test.jsx.snap @@ -271,13 +271,13 @@ exports[`Media Player: Canonical Entry renders a landscape container with a plac `; exports[`Media Player: Canonical Entry renders a placeholder image with guidance 1`] = ` -.c15 { +.c14 { display: block; width: 100%; visibility: visible; } -.c13 { +.c12 { vertical-align: middle; margin: 0 0.25rem; color: #222222; @@ -286,16 +286,7 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance height: 0.75rem; } -.c7 { - vertical-align: middle; - margin: 0 0.25rem; - color: #222222; - fill: currentColor; - width: 1rem; - height: 1rem; -} - -.c11 { +.c10 { -webkit-clip-path: inset(100%); clip-path: inset(100%); -webkit-clip: rect(1px,1px,1px,1px); @@ -307,7 +298,7 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance margin: 0; } -.c9 { +.c8 { background-color: #222222; border: none; color: #FFFFFF; @@ -325,14 +316,14 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance width: 5rem; } -.c9:hover, -.c9:focus { +.c8:hover, +.c8:focus { background-color: #B80000; -webkit-transition: background-color 300ms; transition: background-color 300ms; } -.c12 > svg { +.c11 > svg { color: #FFFFFF; fill: currentColor; height: 1.5rem; @@ -340,7 +331,7 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance width: 1.5rem; } -.c14 { +.c13 { display: block; margin-top: 0.5rem; } @@ -373,7 +364,7 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance padding: 1rem; } -.c8 { +.c7 { padding-left: 0.25rem; font-weight: normal; } @@ -394,13 +385,13 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance height: 100%; } -.c10 { +.c9 { position: absolute; bottom: 0; } -.c1:hover .c10, -.c1:focus .c10 { +.c1:hover .c9, +.c1:focus .c9 { background-color: #B80000; } @@ -434,21 +425,9 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance + /> May contain strong language, sexual or violent content that may offend. @@ -456,19 +435,19 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance From 6adffcf82ea6560140a6407fee90a7b69d008dd1 Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Wed, 6 Nov 2019 16:15:07 +0000 Subject: [PATCH 5/6] snapshots --- .../__snapshots__/index.test.jsx.snap | 27 +++++++- .../__snapshots__/index.test.jsx.snap | 61 +++++++++++++------ .../src/__snapshots__/index.test.jsx.snap | 61 +++++++++++++------ 3 files changed, 106 insertions(+), 43 deletions(-) diff --git a/packages/components/psammead-media-player/src/Guidance/__snapshots__/index.test.jsx.snap b/packages/components/psammead-media-player/src/Guidance/__snapshots__/index.test.jsx.snap index 11dde90b70..85c6cd11b2 100644 --- a/packages/components/psammead-media-player/src/Guidance/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-media-player/src/Guidance/__snapshots__/index.test.jsx.snap @@ -1,6 +1,15 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Media Player: Guidance should render Guidance 1`] = ` +.c4 { + vertical-align: middle; + margin: 0 0.25rem; + color: #222222; + fill: currentColor; + width: 1rem; + height: 1rem; +} + .c0 { font-family: ReithSans,Helvetica,Arial,sans-serif; font-weight: 400; @@ -29,7 +38,7 @@ exports[`Media Player: Guidance should render Guidance 1`] = ` padding: 1rem; } -.c4 { +.c5 { padding-left: 0.25rem; font-weight: normal; } @@ -59,9 +68,21 @@ exports[`Media Player: Guidance should render Guidance 1`] = ` Guidance: Contains strong language with adult humor diff --git a/packages/components/psammead-media-player/src/Placeholder/__snapshots__/index.test.jsx.snap b/packages/components/psammead-media-player/src/Placeholder/__snapshots__/index.test.jsx.snap index 2e847ea039..d6c6bba979 100644 --- a/packages/components/psammead-media-player/src/Placeholder/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-media-player/src/Placeholder/__snapshots__/index.test.jsx.snap @@ -129,13 +129,13 @@ exports[`Media Player: Placeholder should render a video placeholder 1`] = ` `; exports[`Media Player: Placeholder should render a video placeholder with guidance 1`] = ` -.c13 { +.c14 { display: block; width: 100%; visibility: visible; } -.c11 { +.c12 { vertical-align: middle; margin: 0 0.25rem; color: #222222; @@ -144,7 +144,16 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan height: 0.75rem; } -.c9 { +.c6 { + vertical-align: middle; + margin: 0 0.25rem; + color: #222222; + fill: currentColor; + width: 1rem; + height: 1rem; +} + +.c10 { -webkit-clip-path: inset(100%); clip-path: inset(100%); -webkit-clip: rect(1px,1px,1px,1px); @@ -156,7 +165,7 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan margin: 0; } -.c7 { +.c8 { background-color: #222222; border: none; color: #FFFFFF; @@ -174,14 +183,14 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan width: 5rem; } -.c7:hover, -.c7:focus { +.c8:hover, +.c8:focus { background-color: #B80000; -webkit-transition: background-color 300ms; transition: background-color 300ms; } -.c10 > svg { +.c11 > svg { color: #FFFFFF; fill: currentColor; height: 1.5rem; @@ -189,7 +198,7 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan width: 1.5rem; } -.c12 { +.c13 { display: block; margin-top: 0.5rem; } @@ -222,7 +231,7 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan padding: 1rem; } -.c6 { +.c7 { padding-left: 0.25rem; font-weight: normal; } @@ -243,13 +252,13 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan height: 100%; } -.c8 { +.c9 { position: absolute; bottom: 0; } -.c0:hover .c8, -.c0:focus .c8 { +.c0:hover .c9, +.c0:focus .c9 { background-color: #B80000; } @@ -274,9 +283,21 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan Guidance: May contain strong language, sexual or violent content that may offend. @@ -284,19 +305,19 @@ exports[`Media Player: Placeholder should render a video placeholder with guidan diff --git a/packages/components/psammead-media-player/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-media-player/src/__snapshots__/index.test.jsx.snap index 64ed2ab1eb..5c8958185f 100644 --- a/packages/components/psammead-media-player/src/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-media-player/src/__snapshots__/index.test.jsx.snap @@ -271,13 +271,13 @@ exports[`Media Player: Canonical Entry renders a landscape container with a plac `; exports[`Media Player: Canonical Entry renders a placeholder image with guidance 1`] = ` -.c14 { +.c15 { display: block; width: 100%; visibility: visible; } -.c12 { +.c13 { vertical-align: middle; margin: 0 0.25rem; color: #222222; @@ -286,7 +286,16 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance height: 0.75rem; } -.c10 { +.c7 { + vertical-align: middle; + margin: 0 0.25rem; + color: #222222; + fill: currentColor; + width: 1rem; + height: 1rem; +} + +.c11 { -webkit-clip-path: inset(100%); clip-path: inset(100%); -webkit-clip: rect(1px,1px,1px,1px); @@ -298,7 +307,7 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance margin: 0; } -.c8 { +.c9 { background-color: #222222; border: none; color: #FFFFFF; @@ -316,14 +325,14 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance width: 5rem; } -.c8:hover, -.c8:focus { +.c9:hover, +.c9:focus { background-color: #B80000; -webkit-transition: background-color 300ms; transition: background-color 300ms; } -.c11 > svg { +.c12 > svg { color: #FFFFFF; fill: currentColor; height: 1.5rem; @@ -331,7 +340,7 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance width: 1.5rem; } -.c13 { +.c14 { display: block; margin-top: 0.5rem; } @@ -364,7 +373,7 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance padding: 1rem; } -.c7 { +.c8 { padding-left: 0.25rem; font-weight: normal; } @@ -385,13 +394,13 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance height: 100%; } -.c9 { +.c10 { position: absolute; bottom: 0; } -.c1:hover .c9, -.c1:focus .c9 { +.c1:hover .c10, +.c1:focus .c10 { background-color: #B80000; } @@ -425,9 +434,21 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance May contain strong language, sexual or violent content that may offend. @@ -435,19 +456,19 @@ exports[`Media Player: Canonical Entry renders a placeholder image with guidance From a01e67f96ecd95c0b68fae1a6176853e3f848abf Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Wed, 6 Nov 2019 16:37:32 +0000 Subject: [PATCH 6/6] font-weight gest set in the getSerifMedium() --- packages/components/psammead-headings/CHANGELOG.md | 2 +- .../psammead-headings/src/__snapshots__/index.test.jsx.snap | 2 -- packages/components/psammead-headings/src/index.jsx | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/components/psammead-headings/CHANGELOG.md b/packages/components/psammead-headings/CHANGELOG.md index 8e3eb24667..b06d370a30 100644 --- a/packages/components/psammead-headings/CHANGELOG.md +++ b/packages/components/psammead-headings/CHANGELOG.md @@ -3,7 +3,7 @@ | Version | Description | |---------|-------------| -| 3.1.19 | [PR#2575](https://github.com/bbc/psammead/pull/2575) Explicitly set `display` and `font-weight` styles rather than rely on browser default for

| +| 3.1.19 | [PR#2575](https://github.com/bbc/psammead/pull/2575) Explicitly set `display` styles rather than rely on browser default for

| | 3.1.18 | [PR#2519](https://github.com/bbc/psammead/pull/2519) Talos - Bump Dependencies - @bbc/psammead-styles | | 3.1.17 | [PR#2488](https://github.com/bbc/psammead/pull/2488) Talos - Bump Dependencies - @bbc/gel-foundations | | 3.1.16 | [PR#2477](https://github.com/bbc/psammead/pull/2477) Talos - Bump Dependencies - @bbc/psammead-styles | diff --git a/packages/components/psammead-headings/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-headings/src/__snapshots__/index.test.jsx.snap index 448d039883..23f649b365 100644 --- a/packages/components/psammead-headings/src/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-headings/src/__snapshots__/index.test.jsx.snap @@ -9,7 +9,6 @@ exports[`Headline component should render correctly 1`] = ` font-style: normal; color: #3F3F42; display: block; - font-weight: 500; margin: 0; padding: 2rem 0; } @@ -50,7 +49,6 @@ exports[`Headline component should render correctly with arabic script typograph font-style: normal; color: #3F3F42; display: block; - font-weight: 500; margin: 0; padding: 2rem 0; } diff --git a/packages/components/psammead-headings/src/index.jsx b/packages/components/psammead-headings/src/index.jsx index b7a49f569d..2861d592fb 100644 --- a/packages/components/psammead-headings/src/index.jsx +++ b/packages/components/psammead-headings/src/index.jsx @@ -15,7 +15,6 @@ export const Headline = styled.h1` ${({ service }) => getSerifMedium(service)} color: ${C_SHADOW}; display: block; /* Explicitly set */ - font-weight: 500; /* Explicitly set */ margin: 0; /* Reset */ padding: ${GEL_SPACING_QUAD} 0; ${MEDIA_QUERY_TYPOGRAPHY.LAPTOP_AND_LARGER} {