Merge branch 'latest' into update-psammead-snapshots

BBC-archive · Jul 9, 2019 · c61b3df · c61b3df
2 parents 4df4976 + b548d67
commit c61b3df
Show file tree

Hide file tree

Showing 31 changed files with 95 additions and 55 deletions.
diff --git a/packages/components/psammead-brand/CHANGELOG.md b/packages/components/psammead-brand/CHANGELOG.md
@@ -3,7 +3,9 @@
 <!-- prettier-ignore -->
 | Version | Description |
 | ------- | ----------- |
-| 4.1.6 | [PR#783](https://github.com/bbc/psammead/pull/783) Update to latest psammead-test-helpers. Update snapshots. |
+| 4.1.8 | [PR#783](https://github.com/bbc/psammead/pull/783) Update to latest psammead-test-helpers. Update snapshots. |
+| 4.1.7   | [PR#787](https://github.com/bbc/psammead/pull/787) Fix brand colour in Firefox high contrast mode |
+| 4.1.6   | [PR#789](https://github.com/bbc/psammead/pull/789) Use rem for the `BrandSvg` height |
 | 4.1.5   | [PR#769](https://github.com/bbc/psammead/pull/769) Fix stories not appearing in storybook when using `install:packages:link` |
 | 4.1.4   | [PR#747](https://github.com/bbc/psammead/pull/747) Add text role to avoid link fragmented on ios voiceover |
 | 4.1.3   | [PR#713](https://github.com/bbc/psammead/pull/713) Update `styled-components` to 4.3.2 |
@@ -32,3 +34,4 @@
 | 0.1.2   | [PR#227](https://github.com/BBC-News/psammead/pull/227) Replace @bbc/gel-constants and @bbc/gel-foundations-styled-component with [@bbc/gel-foundations in Psammead](https://github.com/BBC-News/psammead/issues/226). |
 | 0.1.1   | [PR#202](https://github.com/BBC-News/psammead/pull/202) Fixes a styling bug caused by an [incorrect constant import](https://github.com/BBC-News/psammead/issues/201). |
 | 0.1.0   | [PR#105](https://github.com/BBC-News/psammead/pull/105) Create initial package, pulled in from [simorgh](https://github.com/BBC-News/simorgh).                         |
+
diff --git a/packages/components/psammead-brand/package-lock.json b/packages/components/psammead-brand/package-lock.json
diff --git a/packages/components/psammead-brand/package.json b/packages/components/psammead-brand/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-brand",
-  "version": "4.1.6",
+  "version": "4.1.8",
   "main": "dist/index.js",
   "description": "Provides the BBC News logo (as SVG), nested a hardcoded link to https://www.bbc.co.uk/news",
   "repository": {
@@ -22,7 +22,7 @@
     "@bbc/psammead-visually-hidden-text": "^0.1.10"
   },
   "devDependencies": {
-    "@bbc/psammead-assets": "^0.1.9",
+    "@bbc/psammead-assets": "^1.0.2",
     "@bbc/psammead-storybook-helpers": "^3.0.0",
     "@bbc/psammead-test-helpers": "^1.0.1",
     "react": "^16.8.6",

diff --git a/packages/components/psammead-brand/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-brand/src/__snapshots__/index.test.jsx.snap
@@ -26,9 +26,11 @@ exports[`Brand should render correctly with link not provided 1`] = `
 
 .c2 {
   box-sizing: content-box;
-  fill: #FFFFFF;
+  color: #FFFFFF;
+  fill: currentColor;
   padding-top: 1rem;
   padding-bottom: 0.75rem;
+  height: 1.5rem;
   width: 100%;
   max-width: 17.5rem;
   min-width: 11.25rem;
@@ -132,9 +134,11 @@ exports[`Brand should render correctly with link provided 1`] = `
 
 .c4 {
   box-sizing: content-box;
-  fill: #FFFFFF;
+  color: #FFFFFF;
+  fill: currentColor;
   padding-top: 1rem;
   padding-bottom: 0.75rem;
+  height: 1.5rem;
   width: 100%;
   max-width: 17.5rem;
   min-width: 11.25rem;
@@ -236,9 +240,11 @@ exports[`Brand should render correctly with no service Localised Name 1`] = `
 
 .c2 {
   box-sizing: content-box;
-  fill: #FFFFFF;
+  color: #FFFFFF;
+  fill: currentColor;
   padding-top: 1rem;
   padding-bottom: 0.75rem;
+  height: 1.5rem;
   width: 100%;
   max-width: 17.5rem;
   min-width: 11.25rem;
@@ -330,9 +336,11 @@ exports[`Brand should render correctly with transparent borders 1`] = `
 
 .c2 {
   box-sizing: content-box;
-  fill: #FFFFFF;
+  color: #FFFFFF;
+  fill: currentColor;
   padding-top: 1rem;
   padding-bottom: 0.75rem;
+  height: 1.5rem;
   width: 100%;
   max-width: 17.5rem;
   min-width: 11.25rem;

diff --git a/packages/components/psammead-brand/src/index.jsx b/packages/components/psammead-brand/src/index.jsx
@@ -56,12 +56,15 @@ const StyledLink = styled.a`
   ${({ maxWidth, minWidth }) => brandWidth(minWidth, maxWidth)}
 `;
 
+// `currentColor` has been used to address high contrast mode in Firefox.
 const BrandSvg = styled.svg`
   box-sizing: content-box;
-  fill: ${C_WHITE};
+  color: ${C_WHITE};
+  fill: currentColor;
   padding-top: ${GEL_SPACING_DBL};
   padding-bottom: ${SVG_BOTTOM_OFFSET_BELOW_400PX};
-
+  height: ${props => props.height / 16}rem;
+  
   ${({ maxWidth, minWidth }) => brandWidth(minWidth, maxWidth)}
 
   @media (min-width: ${GEL_GROUP_2_SCREEN_WIDTH_MIN}) {

diff --git a/packages/components/psammead-consent-banner/CHANGELOG.md b/packages/components/psammead-consent-banner/CHANGELOG.md
@@ -3,7 +3,6 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
-| 1.0.3 | [PR#783](https://github.com/bbc/psammead/pull/783) Update to latest psammead-test-helpers. Update snapshots. |
 | 1.0.2 | [PR#783](https://github.com/bbc/psammead/pull/783) Update to latest psammead-test-helpers. Update snapshots. |
 | 1.0.1   | [PR#713](https://github.com/bbc/psammead/pull/713) Update `styled-components` to 4.3.2 |
 | 1.0.0   | [PR#667](https://github.com/bbc/psammead/pull/667) Create initial package, pulled in from [Simorgh](https://github.com/BBC-News/simorgh). |
diff --git a/packages/components/psammead-consent-banner/package-lock.json b/packages/components/psammead-consent-banner/package-lock.json
diff --git a/packages/components/psammead-consent-banner/package.json b/packages/components/psammead-consent-banner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-consent-banner",
-  "version": "1.0.3",
+  "version": "1.0.2",
   "main": "dist/index.js",
   "description": "React styled components for the Consent Banner",
   "repository": {

diff --git a/packages/components/psammead-copyright/CHANGELOG.md b/packages/components/psammead-copyright/CHANGELOG.md
@@ -3,7 +3,6 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
-| 1.0.4 | [PR#783](https://github.com/bbc/psammead/pull/783) Update to latest psammead-test-helpers. Update snapshots. |
 | 1.0.3 | [PR#783](https://github.com/bbc/psammead/pull/783) Update to latest psammead-test-helpers. Update snapshots. |
 | 1.0.2   | [PR#713](https://github.com/bbc/psammead/pull/713) Update `styled-components` to 4.3.2 |
 | 1.0.1   | [PR#677](https://github.com/bbc/psammead/pull/677) Use `@bbc/[email protected]` |

diff --git a/packages/components/psammead-copyright/package-lock.json b/packages/components/psammead-copyright/package-lock.json
diff --git a/packages/components/psammead-copyright/package.json b/packages/components/psammead-copyright/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-copyright",
-  "version": "1.0.4",
+  "version": "1.0.3",
   "main": "dist/index.js",
   "description": "React styled component for overlaid copyright or source attribution.",
   "repository": {

diff --git a/packages/components/psammead-image-placeholder/CHANGELOG.md b/packages/components/psammead-image-placeholder/CHANGELOG.md
@@ -1,9 +1,8 @@
 # Psammead Image Placeholder Changelog
 
-<!-- prettier-ignore -->
+<! --prettier-ignore -->
 | Version | Description |
 |---------|-------------|
-| 1.0.4 | [PR#783](https://github.com/bbc/psammead/pull/783) Update to latest psammead-test-helpers. Update snapshots. |
 | 1.0.2 | [PR#783](https://github.com/bbc/psammead/pull/783) Update to latest psammead-test-helpers. Update snapshots. |
 | 1.0.1   | [PR#713](https://github.com/bbc/psammead/pull/713) Update `styled-components` to 4.3.2 |
 | 1.0.0 | [PR#679](https://github.com/bbc/psammead/pull/679) Bump version number |

diff --git a/packages/components/psammead-image-placeholder/package-lock.json b/packages/components/psammead-image-placeholder/package-lock.json
diff --git a/packages/components/psammead-image-placeholder/package.json b/packages/components/psammead-image-placeholder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-image-placeholder",
-  "version": "1.0.4",
+  "version": "1.0.2",
   "main": "dist/index.js",
   "description": "Provides a 'BBC' image placeholder",
   "repository": {

diff --git a/packages/components/psammead-media-indicator/CHANGELOG.md b/packages/components/psammead-media-indicator/CHANGELOG.md
@@ -3,7 +3,8 @@
 <!-- prettier-ignore -->
 | Version | Description |
 | ------- | ----------- |
-| 1.0.5 | [PR#783](https://github.com/bbc/psammead/pull/783) Update to latest psammead-test-helpers. Update snapshots. |
+| 1.0.6 | [PR#783](https://github.com/bbc/psammead/pull/783) Update to latest psammead-test-helpers. Update snapshots. |
+| 1.0.5   | [PR#788](https://github.com/BBC/psammead/pull/788) Use rem for the width and height of the Media SVGs |
 | 1.0.4   | [PR#769](https://github.com/bbc/psammead/pull/769) Fix stories not appearing in storybook when using `install:packages:link` |
 | 1.0.3   | [PR#713](https://github.com/bbc/psammead/pull/713) Update `styled-components` to 4.3.2 |
 | 1.0.2   | [PR#722](https://github.com/bbc/psammead/pull/722) Fix hover cap on older browsers |

diff --git a/packages/components/psammead-media-indicator/package-lock.json b/packages/components/psammead-media-indicator/package-lock.json
diff --git a/packages/components/psammead-media-indicator/package.json b/packages/components/psammead-media-indicator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-media-indicator",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "main": "dist/index.js",
   "description": "Provides a play icon and media duration for media page promos",
   "repository": {
@@ -17,12 +17,12 @@
   },
   "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-media-indicator/README.md",
   "dependencies": {
-    "@bbc/gel-foundations": "^3.0.0",
-    "@bbc/psammead-styles": "^0.3.3",
-    "@bbc/psammead-visually-hidden-text": "^0.1.12"
+    "@bbc/gel-foundations": "^3.0.1",
+    "@bbc/psammead-styles": "^1.0.1",
+    "@bbc/psammead-visually-hidden-text": "^1.0.1"
   },
   "devDependencies": {
-    "@bbc/psammead-storybook-helpers": "^3.0.0",
+    "@bbc/psammead-storybook-helpers": "^3.1.0",
     "@bbc/psammead-test-helpers": "^1.0.1",
     "react": "^16.8.6",
     "styled-components": "^4.3.2"

diff --git a/packages/components/psammead-media-indicator/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-media-indicator/src/__snapshots__/index.test.jsx.snap
@@ -16,6 +16,8 @@ exports[`MediaIndicator should render audio correctly without duration details 1
   vertical-align: middle;
   margin: 0 0.25rem;
   fill: #222222;
+  width: 0.8125rem;
+  height: 0.75rem;
 }
 
 .c0 {
@@ -87,6 +89,8 @@ exports[`MediaIndicator should render audio indicator correctly 1`] = `
   vertical-align: middle;
   margin: 0 0.25rem;
   fill: #222222;
+  width: 0.8125rem;
+  height: 0.75rem;
 }
 
 .c0 {
@@ -169,6 +173,8 @@ exports[`MediaIndicator should render video by default 1`] = `
   vertical-align: middle;
   margin: 0 0.25rem;
   fill: #222222;
+  width: 0.75rem;
+  height: 0.75rem;
 }
 
 .c0 {
@@ -237,6 +243,8 @@ exports[`MediaIndicator should render video correctly without duration details 1
   vertical-align: middle;
   margin: 0 0.25rem;
   fill: #222222;
+  width: 0.75rem;
+  height: 0.75rem;
 }
 
 .c0 {
@@ -305,6 +313,8 @@ exports[`MediaIndicator should render video indicator correctly 1`] = `
   vertical-align: middle;
   margin: 0 0.25rem;
   fill: #222222;
+  width: 0.75rem;
+  height: 0.75rem;
 }
 
 .c0 {

diff --git a/packages/components/psammead-media-indicator/src/mediaIcons.jsx b/packages/components/psammead-media-indicator/src/mediaIcons.jsx
@@ -9,17 +9,37 @@ const MediaIcon = styled.svg`
   fill: ${C_EBON};
 `;
 
+const VideoMediaIcon = styled(MediaIcon)`
+  width: 0.75rem;
+  height: 0.75rem;
+`;
+
+const AudioMediaIcon = styled(MediaIcon)`
+  width: 0.8125rem;
+  height: 0.75rem;
+`;
+
 const icons = {
   video: (
-    <MediaIcon viewBox="0 0 32 32" width="12px" height="12px" focusable="false">
+    <VideoMediaIcon
+      viewBox="0 0 32 32"
+      width="12px"
+      height="12px"
+      focusable="false"
+    >
       <polygon points="3,32 29,16 3,0" />
-    </MediaIcon>
+    </VideoMediaIcon>
   ),
   audio: (
-    <MediaIcon viewBox="0 0 13 12" width="13px" height="12px" focusable="false">
+    <AudioMediaIcon
+      viewBox="0 0 13 12"
+      width="13px"
+      height="12px"
+      focusable="false"
+    >
       <path d="M9.021 1.811l-.525.525c.938.938 1.5 2.25 1.5 3.675s-.563 2.738-1.5 3.675l.525.525c1.05-1.087 1.725-2.55 1.725-4.2s-.675-3.112-1.725-4.2z" />
       <path d="M10.596.199l-.525.562c1.35 1.35 2.175 3.225 2.175 5.25s-.825 3.9-2.175 5.25l.525.525c1.5-1.462 2.4-3.525 2.4-5.775s-.9-4.312-2.4-5.812zM6.996 1.511l-2.25 2.25H.996v4.5h3.75l2.25 2.25z" />
-    </MediaIcon>
+    </AudioMediaIcon>
   ),
 };
 

diff --git a/packages/components/psammead-story-promo-list/CHANGELOG.md b/packages/components/psammead-story-promo-list/CHANGELOG.md
@@ -4,7 +4,6 @@
 | Version | Description |
 | ------- | ----------- |
 | 1.0.4 | [PR#783](https://github.com/bbc/psammead/pull/783) Update to latest psammead-test-helpers. Update snapshots. |
-| 1.0.3 | [PR#783](https://github.com/bbc/psammead/pull/783) Update to latest psammead-test-helpers. Update snapshots. |
 | 1.0.2   | [PR#760](https://github.com/BBC/psammead/pull/760) Add missing 1.0.0 record to CHANGELOG and bump dependencies |
 | 1.0.1   | [PR#713](https://github.com/BBC/psammead/pull/713) Update `styled-components` to 4.3.2 |
 | 1.0.0   | [PR#741](https://github.com/BBC/psammead/pull/741) Remove alpha tag |

diff --git a/packages/containers/psammead-timestamp-container/CHANGELOG.md b/packages/containers/psammead-timestamp-container/CHANGELOG.md
@@ -3,7 +3,6 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
-| 1.2.4 | [PR#783](https://github.com/bbc/psammead/pull/783) Update to latest psammead-test-helpers. Update snapshots. |
 | 1.2.3 | [PR#783](https://github.com/bbc/psammead/pull/783) Update to latest psammead-test-helpers. Update snapshots. |
 | 1.2.2 | [PR#677](https://github.com/bbc/psammead/pull/677) Use `@bbc/[email protected]` |
 | 1.2.1 | [PR#666](https://github.com/bbc/psammead/pull/666) Do not localise `datetime` |

diff --git a/packages/containers/psammead-timestamp-container/package-lock.json b/packages/containers/psammead-timestamp-container/package-lock.json
diff --git a/packages/containers/psammead-timestamp-container/package.json b/packages/containers/psammead-timestamp-container/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-timestamp-container",
-  "version": "1.2.4",
+  "version": "1.2.3",
   "main": "dist/index.js",
   "description": "React Timestamp container for relative and absolute times, using moment-timezone",
   "repository": {