From 0302ff92c3b82ef518cd299eda177c41d37e2c35 Mon Sep 17 00:00:00 2001 From: Irinaa133 <33098238+Irinaa133@users.noreply.github.com> Date: Wed, 18 Nov 2020 14:56:35 +0300 Subject: [PATCH 1/2] feat(core): bell and feed icon (#347) --- packages/core/src/icon/FeedIcon.tsx | 38 +++++++++++++++++++++++++++ packages/core/src/icon/FilterIcon.tsx | 2 +- packages/core/src/icon/Icon.md | 5 +++- packages/core/src/icon/Icon.tsx | 2 ++ packages/core/src/icon/index.ts | 1 + 5 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 packages/core/src/icon/FeedIcon.tsx diff --git a/packages/core/src/icon/FeedIcon.tsx b/packages/core/src/icon/FeedIcon.tsx new file mode 100644 index 000000000..26464dbc5 --- /dev/null +++ b/packages/core/src/icon/FeedIcon.tsx @@ -0,0 +1,38 @@ +import React, {FC} from 'react' + +import {Svg, Path, Circle} from '../primitive' + +export interface FeedIconProps { + size?: number + color?: string + active?: boolean +} + +export const FeedIcon: FC = ({ + size = 6, + color = '#000', + active = false, +}) => ( + + + {active ? ( + + ) : ( + null + )} + +) + +FeedIcon.defaultProps = { + size: 6, + color: '#000', + active: false, +} diff --git a/packages/core/src/icon/FilterIcon.tsx b/packages/core/src/icon/FilterIcon.tsx index ea9647e55..36bb722e6 100644 --- a/packages/core/src/icon/FilterIcon.tsx +++ b/packages/core/src/icon/FilterIcon.tsx @@ -23,7 +23,7 @@ export const FilterIcon: FC = ({ cx="21" cy="3" r="3" - fill="#D0021B" + fill="#ed4848" /> ) : ( null diff --git a/packages/core/src/icon/Icon.md b/packages/core/src/icon/Icon.md index 4ce26fabd..73542dfcd 100644 --- a/packages/core/src/icon/Icon.md +++ b/packages/core/src/icon/Icon.md @@ -41,9 +41,12 @@ setState({filterIconActive: !state.filterIconActive})}> - setState({crossBurgerActive: !state.crossBurgerActive})}> + setState({crossBurgerActive: !state.crossBurgerActive})}> + setState({feedIconActive: !state.feedIconActive})}> + + diff --git a/packages/core/src/icon/Icon.tsx b/packages/core/src/icon/Icon.tsx index 59f522ce6..a0df904d7 100644 --- a/packages/core/src/icon/Icon.tsx +++ b/packages/core/src/icon/Icon.tsx @@ -27,6 +27,7 @@ export interface IconProps { 'attention' | 'backward' | 'bank' | + 'bell' | 'calendar' | 'card' | 'camera' | @@ -127,6 +128,7 @@ export const IconPaths: { [name in IconProps['name']]: string } = { 'attention': 'M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-3.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3zm0-13a1.366 1.366 0 0 0-1.36 1.493l.61 6.507h1.5l.61-6.507A1.366 1.366 0 0 0 12 5.5z', 'backward': 'M12 2C6.417 2 2 6.417 2 12s4.417 10 10 10 10-4.5 10-10S17.5 2 12 2zm3 10.8h-3.9l.9.9c.4.3.4.8 0 1.2-.1.1-.4.2-.6.2-.2 0-.4-.1-.6-.2l-2.4-2.4c-.3-.4-.3-.9 0-1.2L10.8 9c.3-.4.8-.4 1.2 0 .4.4.4.9 0 1.2l-.9.9H15c.4 0 .9.4.9.9s-.5.8-.9.8z', 'bank': 'M3 8.044a.969.969 0 0 1 .553-.938l8-4a1 1 0 0 1 .894 0l8 4a.969.969 0 0 1 .553.938V19a1 1 0 0 1 0 2H3a1 1 0 0 1 0-2V8.044zM5 9v10h3V9H5zm14 0h-3v10h3V9zm-9 0v10h4V9h-4zM8.236 7h7.528L12 5.118 8.236 7z', + 'bell': 'M7.92 2.92A3 3 0 0110 2a3.2 3.2 0 012.88 2.23c.92.34 1.68.92 2.22 1.79.64 1.03.9 2.37.9 3.98 0 .87.16 1.39.35 1.72.18.35.44.6.79.89l.14.11c.31.26.74.6 1.06 1.06.42.57.66 1.28.66 2.22 0 1-.34 1.8-.98 2.33-.62.51-1.37.67-2.02.67h-3a3 3 0 11-6 0H4c-.65 0-1.4-.16-2.02-.67A2.91 2.91 0 011 16c0-.94.24-1.65.66-2.22.32-.46.75-.8 1.06-1.06l.14-.11c.35-.3.6-.54.8-.89.18-.33.34-.85.34-1.72 0-1.61.26-2.95.9-3.98a4.31 4.31 0 012.22-1.8c.15-.5.45-.95.8-1.3zM4 17h12c.35 0 .6-.09.73-.2.11-.1.27-.3.27-.8 0-.56-.13-.85-.28-1.06-.16-.22-.36-.38-.68-.65l-.18-.15c-.4-.33-.9-.77-1.27-1.46-.38-.7-.59-1.55-.59-2.68 0-1.43-.24-2.34-.6-2.93a2.5 2.5 0 00-1.64-1.1A1 1 0 0111 5c0-.17-.1-.43-.33-.67-.24-.23-.5-.33-.67-.33-.17 0-.43.1-.67.33-.23.24-.33.5-.33.67a1 1 0 01-.76.97c-.8.2-1.3.56-1.64 1.1-.36.59-.6 1.5-.6 2.93 0 1.13-.21 1.99-.6 2.68a4.98 4.98 0 01-1.44 1.61c-.32.27-.52.43-.68.65-.15.2-.28.5-.28 1.06 0 .5.16.7.27.8.13.11.38.2.73.2zm5 2a1 1 0 102 0H9z', 'calendar': 'M17 4h1.006A2.995 2.995 0 0 1 21 7.01v9.98A3.004 3.004 0 0 1 18.006 20H5.994A2.995 2.995 0 0 1 3 16.99V7.01A3.004 3.004 0 0 1 5.994 4H7V3a1 1 0 1 1 2 0v1h6V3a1 1 0 0 1 2 0v1zm0 2v1a1 1 0 0 1-2 0V6H9v1a1 1 0 1 1-2 0V6H5.994C5.45 6 5 6.45 5 7.01v9.98c0 .566.443 1.01.994 1.01h12.012c.545 0 .994-.45.994-1.01V7.01A.995.995 0 0 0 18.006 6H17zm-9 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm-8 4a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2z', 'camera': 'M5 5h2c.42 0 .849-.28 1.285-.841A3 3 0 0 1 10.653 3h2.68a3 3 0 0 1 2.373 1.165c.43.557.861.835 1.294.835h2a3 3 0 0 1 3 3v9.154c0 1.337-.14 1.822-.4 2.311a2.726 2.726 0 0 1-1.135 1.134c-.489.262-.974.401-2.31.401H5.844c-1.336 0-1.821-.14-2.31-.4A2.726 2.726 0 0 1 2.4 19.464c-.262-.489-.401-.974-.401-2.31V8a3 3 0 0 1 3-3zm0 2a1 1 0 0 0-1 1v9.154c0 .917.043 1.142.164 1.368.075.14.174.239.314.314.226.12.45.164 1.368.164h12.308c.917 0 1.142-.043 1.368-.164a.727.727 0 0 0 .314-.314c.12-.226.164-.45.164-1.368V8a1 1 0 0 0-1-1h-2c-1.155 0-2.104-.612-2.876-1.612A1 1 0 0 0 13.332 5h-2.679a1 1 0 0 0-.79.386C9.087 6.386 8.15 7 7 7H5zm7 10a4 4 0 1 1 0-8 4 4 0 0 1 0 8zm0-2a2 2 0 1 0 0-4 2 2 0 0 0 0 4z', 'card': 'M20 8v-.99A.995.995 0 0 0 19.006 6H4.994C4.45 6 4 6.45 4 7.01V8h16zm0 2H4v6.99c0 .566.443 1.01.994 1.01h14.012c.545 0 .994-.45.994-1.01V10zM2 7.01A3.004 3.004 0 0 1 4.994 4h14.012A2.995 2.995 0 0 1 22 7.01v9.98A3.004 3.004 0 0 1 19.006 20H4.994A2.995 2.995 0 0 1 2 16.99V7.01z', diff --git a/packages/core/src/icon/index.ts b/packages/core/src/icon/index.ts index 843d15421..68369c6ed 100644 --- a/packages/core/src/icon/index.ts +++ b/packages/core/src/icon/index.ts @@ -2,6 +2,7 @@ export * from './Icon' export * from './QuestionIcon' export * from './FilterIcon' +export * from './FeedIcon' export * from './MobileAppIcon' From 4e77975f88d036f60eca71e72f40989313de7ceb Mon Sep 17 00:00:00 2001 From: "@qiwibot" Date: Wed, 18 Nov 2020 12:03:14 +0000 Subject: [PATCH 2/2] chore(@qiwi/pijma-core): release 1.116.0 [skip ci] # [@qiwi/pijma-core-v1.116.0](https://github.com/qiwi/pijma/compare/v1.115.1...v1.116.0) (2020-11-18) ### Features * **core:** bell and feed icon ([#347](https://github.com/qiwi/pijma/issues/347)) ([0302ff9](https://github.com/qiwi/pijma/commit/0302ff9)) --- packages/core/CHANGELOG.md | 7 +++++++ packages/core/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index e9e447719..1a6e7c1c5 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -1,3 +1,10 @@ +# [@qiwi/pijma-core-v1.116.0](https://github.com/qiwi/pijma/compare/v1.115.1...v1.116.0) (2020-11-18) + + +### Features + +* **core:** bell and feed icon ([#347](https://github.com/qiwi/pijma/issues/347)) ([0302ff9](https://github.com/qiwi/pijma/commit/0302ff9)) + # [@qiwi/pijma-core-v1.114.1](https://github.com/qiwi/pijma/compare/v1.114.0...v1.114.1) (2020-10-28) diff --git a/packages/core/package.json b/packages/core/package.json index 7f4e6eb47..2e4804fbe 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@qiwi/pijma-core", - "version": "1.114.1", + "version": "1.116.0", "main": "lib/es5/index.js", "types": "lib/es5/index.d.ts", "license": "MIT",