diff --git a/packages/components/psammead-media-indicator/CHANGELOG.md b/packages/components/psammead-media-indicator/CHANGELOG.md index 2644bcd75c..8cb8afa67b 100644 --- a/packages/components/psammead-media-indicator/CHANGELOG.md +++ b/packages/components/psammead-media-indicator/CHANGELOG.md @@ -3,6 +3,7 @@ | Version | Description | | ------- | ----------- | +| 2.6.0 | [PR#2199](https://github.com/bbc/psammead/pull/2199) Pull in media icons from @bbc/psammead-assets | | 2.5.9 | [PR#2191](https://github.com/bbc/psammead/pull/2191) Talos - Bump Dependencies - @bbc/gel-foundations | | 2.5.8 | [PR#2145](https://github.com/bbc/psammead/pull/2145) Talos - Bump Dependencies - @bbc/psammead-styles | | 2.5.7 | [PR#2081](https://github.com/bbc/psammead/pull/2081) Talos - Bump Dependencies - @bbc/psammead-styles | diff --git a/packages/components/psammead-media-indicator/package-lock.json b/packages/components/psammead-media-indicator/package-lock.json index 3478f22c92..0aff95c524 100644 --- a/packages/components/psammead-media-indicator/package-lock.json +++ b/packages/components/psammead-media-indicator/package-lock.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-media-indicator", - "version": "2.5.9", + "version": "2.6.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -9,6 +9,11 @@ "resolved": "https://registry.npmjs.org/@bbc/gel-foundations/-/gel-foundations-3.4.0.tgz", "integrity": "sha512-WuewciWzvSb/WKhUGSvIoighqCdXGN2PsVQbZbUo5/eWi5+o3O8uoojUpeQeRZMYWLsLVELPHr6qJDuqKghXKA==" }, + "@bbc/psammead-assets": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@bbc/psammead-assets/-/psammead-assets-2.3.0.tgz", + "integrity": "sha512-pejORKWrs9O4AqxWteAnS8N6KlEaayG3W6NGF7JZDiNgs6xYgzQ1Aj1CQva9FKVirdlqNYln9TxFTSSNIiyr4A==" + }, "@bbc/psammead-styles": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@bbc/psammead-styles/-/psammead-styles-2.3.0.tgz", diff --git a/packages/components/psammead-media-indicator/package.json b/packages/components/psammead-media-indicator/package.json index bc83120923..567ea71a02 100644 --- 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": "2.5.9", + "version": "2.6.0", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false, @@ -20,7 +20,8 @@ "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-media-indicator/README.md", "dependencies": { "@bbc/gel-foundations": "^3.4.0", - "@bbc/psammead-styles": "^2.3.0" + "@bbc/psammead-styles": "^2.3.0", + "@bbc/psammead-assets": "^2.3.0" }, "peerDependencies": { "react": "^16.9.0", diff --git a/packages/components/psammead-media-indicator/src/index.jsx b/packages/components/psammead-media-indicator/src/index.jsx index 484d65cb2e..9972f63396 100644 --- a/packages/components/psammead-media-indicator/src/index.jsx +++ b/packages/components/psammead-media-indicator/src/index.jsx @@ -6,7 +6,7 @@ import { GEL_SPACING, GEL_SPACING_HLF } from '@bbc/gel-foundations/spacings'; import { GEL_GROUP_1_SCREEN_WIDTH_MAX } from '@bbc/gel-foundations/breakpoints'; import { GEL_MINION } from '@bbc/gel-foundations/typography'; import { getSansRegular } from '@bbc/psammead-styles/font-styles'; -import mediaIcons from './mediaIcons'; +import { mediaIcons } from '@bbc/psammead-assets/svgs'; const MediaIndicatorWrapper = styled.div` padding: ${GEL_SPACING} ${GEL_SPACING_HLF}; diff --git a/packages/components/psammead-media-indicator/src/mediaIcons.jsx b/packages/components/psammead-media-indicator/src/mediaIcons.jsx deleted file mode 100644 index 1fb8c02333..0000000000 --- a/packages/components/psammead-media-indicator/src/mediaIcons.jsx +++ /dev/null @@ -1,64 +0,0 @@ -import React from 'react'; -import styled from 'styled-components'; -import { C_EBON } from '@bbc/psammead-styles/colours'; -import { GEL_SPACING_HLF } from '@bbc/gel-foundations/spacings'; - -// `currentColor` has been used to better reflect user colour choices in Firefox. -const MediaIcon = styled.svg` - vertical-align: middle; - margin: 0 ${GEL_SPACING_HLF}; - color: ${C_EBON}; - fill: currentColor; -`; - -const VideoMediaIcon = styled(MediaIcon)` - width: 0.75rem; - height: 0.75rem; -`; - -const AudioMediaIcon = styled(MediaIcon)` - width: 0.8125rem; - height: 0.75rem; -`; - -const PhotoMediaIcon = styled(MediaIcon)` - width: 1rem; - height: 0.8125rem; -`; - -const icons = { - video: ( - - - - ), - audio: ( - - - - - ), - photogallery: ( - - - - - ), -}; - -export default icons;