Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: icons refactoring #191

Merged
merged 11 commits into from
Aug 23, 2019
Merged

feat: icons refactoring #191

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
edd962c
feat: icons refactoring
dimonka83 Aug 5, 2019
4160cea
docs: change docs
dimonka83 Aug 6, 2019
b6638cc
feat: add transfer and case
dimonka83 Aug 6, 2019
83198d5
docs: modify special icons
dimonka83 Aug 7, 2019
884a262
feat: add new icon, minimize, etc
dimonka83 Aug 8, 2019
0cd9bfd
fix: button icon color
dimonka83 Aug 8, 2019
5440331
Merge branch 'master' into icons-refactoring
dimonka83 Aug 9, 2019
438aef6
fix: status
dimonka83 Aug 9, 2019
8076421
style: format svg paths
dimonka83 Aug 12, 2019
b672730
Merge remote-tracking branch 'origin/master' into icons-refactoring
dimonka83 Aug 20, 2019
2a878e9
Merge remote-tracking branch 'origin/master' into icons-refactoring
dimonka83 Aug 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"dependencies": {
"@emotion/core": "^10.0.14",
"@emotion/styled": "^10.0.14",
"@qiwi/pijma-media": "^1.x.x",
"@types/dom-helpers": "^3.4.1",
"@types/react": "^16.8.23",
"@types/react-dom": "^16.8.4",
Expand Down
43 changes: 35 additions & 8 deletions packages/media/src/icon/FilterIcon.tsx → packages/core/src/icon/FilterIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,44 @@
import React from 'react'
import React, {FC} from 'react'

const FilterIcon: React.FunctionComponent = () => (
<svg viewBox="0 0 24 24" focusable="false">
<path
import {Svg, Path} from '../primitive'

export interface FilterIconProps {
size?: number
color?: string
active?: boolean
}

export const FilterIcon: FC<FilterIconProps> = ({
size = 6,
color = '#000',
active = false,
}) => (
<Svg width={size} height={size} viewBox="0 0 24 24" focusable="false">
<Path
d="M4,7h8.2c0.4,1.2,1.5,2,2.8,2s2.4-0.8,2.8-2H20c0.6,0,1-0.4,1-1s-0.4-1-1-1h-2.2c-0.4-1.2-1.5-2-2.8-2s-2.4,0.8-2.8,2H4 C3.4,5,3,5.4,3,6S3.4,7,4,7z M15,5c0.6,0,1,0.4,1,1s-0.4,1-1,1s-1-0.4-1-1S14.4,5,15,5z"
fill={color}
/>
<path
<Path
d="M20,11h-8.2C11.4,9.8,10.3,9,9,9s-2.4,0.8-2.8,2H4c-0.6,0-1,0.4-1,1s0.4,1,1,1h2.2c0.4,1.2,1.5,2,2.8,2s2.4-0.8,2.8-2H20 c0.6,0,1-0.4,1-1S20.6,11,20,11z M9,13c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S9.6,13,9,13z"
fill={color}
/>
<path
<Path
d="M20,17h-1.2c-0.4-1.2-1.5-2-2.8-2s-2.4,0.8-2.8,2H4c-0.6,0-1,0.4-1,1s0.4,1,1,1h9.2c0.4,1.2,1.5,2,2.8,2s2.4-0.8,2.8-2H20 c0.6,0,1-0.4,1-1S20.6,17,20,17z M16,19c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S16.6,19,16,19z"
fill={color}
/>
</svg>
{active ? (
<Path
d="M18,3a3,3 0 1,0 6,0a3,3 0 1,0 -6,0"
fill="#D0021B"
/>
) : (
null
)}
</Svg>
)

export default FilterIcon
FilterIcon.defaultProps = {
size: 6,
color: '#000',
active: false,
}
Loading