diff --git a/CHANGELOG.md b/CHANGELOG.md index 29983b1462..07ef1f0fa1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,11 +21,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Prevent blind props forwarding if `Input`'s wrapper is defined as React element @kuzhelov ([#453](https://github.com/stardust-ui/react/pull/453)) - Fix invalid whatInput import @miroslavstastny ([#541](https://github.com/stardust-ui/react/pull/541)) - Fix invalid typings and propTypes for the content prop @mnajdova ([#528](https://github.com/stardust-ui/react/pull/528)) +- Fix Teams SVG icons @kuzhelov ([#544](https://github.com/stardust-ui/react/pull/544)) ### Features - Add all default size Teams icons processed & ready to be consumed by Stardust as needed @codepretty ([#478](https://github.com/stardust-ui/react/pull/478)) - Add `Tree` Component @priyankar205 ([#479] (https://github.com/stardust-ui/react/pull/479)) +- Add several Teams SVG icons @kuzhelov ([#544](https://github.com/stardust-ui/react/pull/544)) ## [v0.13.0](https://github.com/stardust-ui/react/tree/v0.13.0) (2018-11-27) diff --git a/src/themes/teams/components/Icon/font/index.ts b/src/themes/teams/components/Icon/font/index.ts index 6d7da3f101..c938192460 100644 --- a/src/themes/teams/components/Icon/font/index.ts +++ b/src/themes/teams/components/Icon/font/index.ts @@ -1,11 +1,3 @@ import { FontIconSpec } from '../../../../types' -const fontAwesome = (iconCode: string): FontIconSpec => ({ - fontFamily: 'Icons', - content: `'\\${iconCode}'`, -}) - -export default { - 'call-home': fontAwesome('f015'), - 'take-rest': fontAwesome('f0f4'), -} as { [key: string]: FontIconSpec } +export default {} as { [key: string]: FontIconSpec } diff --git a/src/themes/teams/components/Icon/svg/icons/addParticipant.tsx b/src/themes/teams/components/Icon/svg/icons/addParticipant.tsx new file mode 100644 index 0000000000..72125e44e9 --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/addParticipant.tsx @@ -0,0 +1,18 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/bookmark.tsx b/src/themes/teams/components/Icon/svg/icons/bookmark.tsx index dd5fe18a50..6de144a925 100644 --- a/src/themes/teams/components/Icon/svg/icons/bookmark.tsx +++ b/src/themes/teams/components/Icon/svg/icons/bookmark.tsx @@ -3,22 +3,16 @@ import { TeamsSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - - - + + + ), - styles: { - svg: ({ variables }) => { - return { - fill: variables.color, - } - }, - }, + styles: {}, } as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/bullets.tsx b/src/themes/teams/components/Icon/svg/icons/bullets.tsx index eeb33d5ca2..63a201b955 100644 --- a/src/themes/teams/components/Icon/svg/icons/bullets.tsx +++ b/src/themes/teams/components/Icon/svg/icons/bullets.tsx @@ -3,31 +3,20 @@ import { TeamsSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + ), diff --git a/src/themes/teams/components/Icon/svg/icons/calendar.tsx b/src/themes/teams/components/Icon/svg/icons/calendar.tsx new file mode 100644 index 0000000000..736c5a93b9 --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/calendar.tsx @@ -0,0 +1,24 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/callControlPresentNew.tsx b/src/themes/teams/components/Icon/svg/icons/callControlPresentNew.tsx index 8c318633a2..8bb59d15ee 100644 --- a/src/themes/teams/components/Icon/svg/icons/callControlPresentNew.tsx +++ b/src/themes/teams/components/Icon/svg/icons/callControlPresentNew.tsx @@ -4,21 +4,8 @@ import { TeamsSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - - - + + ), styles: {}, diff --git a/src/themes/teams/components/Icon/svg/icons/callControlStopPresentingNew.tsx b/src/themes/teams/components/Icon/svg/icons/callControlStopPresentingNew.tsx index e7cbaa97df..720fbd969a 100644 --- a/src/themes/teams/components/Icon/svg/icons/callControlStopPresentingNew.tsx +++ b/src/themes/teams/components/Icon/svg/icons/callControlStopPresentingNew.tsx @@ -4,22 +4,8 @@ import { TeamsSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - - - + + ), styles: {}, diff --git a/src/themes/teams/components/Icon/svg/icons/callEnd.tsx b/src/themes/teams/components/Icon/svg/icons/callEnd.tsx index 2bfe53af12..fc16b27b3e 100644 --- a/src/themes/teams/components/Icon/svg/icons/callEnd.tsx +++ b/src/themes/teams/components/Icon/svg/icons/callEnd.tsx @@ -3,13 +3,8 @@ import { TeamsSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - + + ), styles: {}, diff --git a/src/themes/teams/components/Icon/svg/icons/callIncomingVideoOff.tsx b/src/themes/teams/components/Icon/svg/icons/callIncomingVideoOff.tsx deleted file mode 100644 index db7f2f5ac0..0000000000 --- a/src/themes/teams/components/Icon/svg/icons/callIncomingVideoOff.tsx +++ /dev/null @@ -1,32 +0,0 @@ -import * as React from 'react' -import { TeamsSvgIconSpec } from '../types' - -export default { - icon: ({ classes }) => ( - - - - ), - styles: {}, -} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/callMicrophone.tsx b/src/themes/teams/components/Icon/svg/icons/callMicrophone.tsx deleted file mode 100644 index aa4ac9870d..0000000000 --- a/src/themes/teams/components/Icon/svg/icons/callMicrophone.tsx +++ /dev/null @@ -1,43 +0,0 @@ -import * as React from 'react' -import { TeamsSvgIconSpec } from '../types' - -export default { - icon: ({ classes }) => ( - - - - ), - styles: {}, -} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/callMicrophoneOff.tsx b/src/themes/teams/components/Icon/svg/icons/callMicrophoneOff.tsx deleted file mode 100644 index 5e2b24b7cd..0000000000 --- a/src/themes/teams/components/Icon/svg/icons/callMicrophoneOff.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import * as React from 'react' -import { TeamsSvgIconSpec } from '../types' - -export default { - icon: ({ classes }) => ( - - - - ), - styles: {}, -} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/callIncomingVideo.tsx b/src/themes/teams/components/Icon/svg/icons/callVideo.tsx similarity index 100% rename from src/themes/teams/components/Icon/svg/icons/callIncomingVideo.tsx rename to src/themes/teams/components/Icon/svg/icons/callVideo.tsx diff --git a/src/themes/teams/components/Icon/svg/icons/callVideoOff.tsx b/src/themes/teams/components/Icon/svg/icons/callVideoOff.tsx new file mode 100644 index 0000000000..660017011c --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/callVideoOff.tsx @@ -0,0 +1,20 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/edit.tsx b/src/themes/teams/components/Icon/svg/icons/edit.tsx new file mode 100644 index 0000000000..60b1bafc9c --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/edit.tsx @@ -0,0 +1,20 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/error.tsx b/src/themes/teams/components/Icon/svg/icons/error.tsx new file mode 100644 index 0000000000..cf23574305 --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/error.tsx @@ -0,0 +1,18 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + ), + styles: { + redPath: ({ variables: v }) => ({ + fill: v.redColor, + }), + }, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/index.ts b/src/themes/teams/components/Icon/svg/icons/index.ts index 6f65cfade7..251c0057ce 100644 --- a/src/themes/teams/components/Icon/svg/icons/index.ts +++ b/src/themes/teams/components/Icon/svg/icons/index.ts @@ -1,49 +1,77 @@ import { TeamsSvgIconSpec } from '../types' import add from './add' +import addParticipant from './addParticipant' import bookmark from './bookmark' import bullets from './bullets' +import calendar from './calendar' import call from './call' +import callControlPresentNew from './callControlPresentNew' +import callControlStopPresentingNew from './callControlStopPresentingNew' import callEnd from './callEnd' -import callVideo from './callIncomingVideo' -import callVideoOff from './callIncomingVideoOff' -import callStartPresenting from './callControlPresentNew' -import callStopPresenting from './callControlStopPresentingNew' -import callMicrophone from './callMicrophone' -import callMicrophoneOff from './callMicrophoneOff' +import callVideo from './callVideo' +import callVideoOff from './callVideoOff' +import edit from './edit' +import error from './error' +import fontColor from './fontColor' +import fontSize from './fontSize' +import format from './format' import gallery from './gallery' +import giphy from './giphy' +import highlight from './highlight' +import leave from './leave' +import like from './like' +import markAsUnread from './markAsUnread' +import mention from './mention' import menu from './menu' +import mic from './mic' +import micOff from './micOff' import more from './more' +import participantRemove from './participantRemove' +import redbang from './redbang' +import reply from './reply' +import retry from './retry' +import send from './send' import teamCreate from './teamCreate' -import umbrella from './umbrella' import teams from './teams' -import format from './format' -import giphy from './giphy' -import fontColor from './fontColor' -import fontSize from './fontSize' -import highlight from './highlight' +import translation from './translation' +import trashCan from './trashCan' export default { add, bookmark, bullets, + calendar, call, 'call-end': callEnd, 'call-video': callVideo, 'call-video-off': callVideoOff, - 'call-start-presenting': callStartPresenting, - 'call-stop-presenting': callStopPresenting, - 'call-microphone': callMicrophone, - 'call-microphone-off': callMicrophoneOff, + 'call-control-present-new': callControlPresentNew, + 'call-control-stop-presenting-new': callControlStopPresentingNew, + edit, + error, + format, + 'font-color': fontColor, + 'font-size': fontSize, gallery, + giphy, + highlight, + leave, + like, + 'mark-as-unread': markAsUnread, + mention, menu, + mic, + 'mic-off': micOff, more, - 'team-create': teamCreate, - umbrella, + 'participant-add': addParticipant, + 'participant-remove': participantRemove, + redbang, + reply, + retry, + send, teams, - format, - giphy, - highlight, - 'font-color': fontColor, - 'font-size': fontSize, + translation, + 'trash-can': trashCan, + 'team-create': teamCreate, } as { [iconName: string]: TeamsSvgIconSpec } diff --git a/src/themes/teams/components/Icon/svg/icons/leave.tsx b/src/themes/teams/components/Icon/svg/icons/leave.tsx new file mode 100644 index 0000000000..d33d995684 --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/leave.tsx @@ -0,0 +1,11 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/like.tsx b/src/themes/teams/components/Icon/svg/icons/like.tsx new file mode 100644 index 0000000000..606c1de2cd --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/like.tsx @@ -0,0 +1,13 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/markAsUnread.tsx b/src/themes/teams/components/Icon/svg/icons/markAsUnread.tsx new file mode 100644 index 0000000000..fc4795b42f --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/markAsUnread.tsx @@ -0,0 +1,18 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + + + + + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/mention.tsx b/src/themes/teams/components/Icon/svg/icons/mention.tsx new file mode 100644 index 0000000000..c94aa7201e --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/mention.tsx @@ -0,0 +1,20 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/menu.tsx b/src/themes/teams/components/Icon/svg/icons/menu.tsx index ffc99aeba3..33ae474dfe 100644 --- a/src/themes/teams/components/Icon/svg/icons/menu.tsx +++ b/src/themes/teams/components/Icon/svg/icons/menu.tsx @@ -3,10 +3,8 @@ import { TeamsSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - - - + + ), styles: {}, diff --git a/src/themes/teams/components/Icon/svg/icons/mic.tsx b/src/themes/teams/components/Icon/svg/icons/mic.tsx new file mode 100644 index 0000000000..4370ef478c --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/mic.tsx @@ -0,0 +1,11 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/micOff.tsx b/src/themes/teams/components/Icon/svg/icons/micOff.tsx new file mode 100644 index 0000000000..0a1e801f06 --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/micOff.tsx @@ -0,0 +1,11 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/participantRemove.tsx b/src/themes/teams/components/Icon/svg/icons/participantRemove.tsx new file mode 100644 index 0000000000..12ca43a4af --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/participantRemove.tsx @@ -0,0 +1,20 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/redbang.tsx b/src/themes/teams/components/Icon/svg/icons/redbang.tsx new file mode 100644 index 0000000000..d255f507a6 --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/redbang.tsx @@ -0,0 +1,20 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + + + + + + + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/reply.tsx b/src/themes/teams/components/Icon/svg/icons/reply.tsx new file mode 100644 index 0000000000..227b58c2fa --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/reply.tsx @@ -0,0 +1,18 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/retry.tsx b/src/themes/teams/components/Icon/svg/icons/retry.tsx new file mode 100644 index 0000000000..51e914161e --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/retry.tsx @@ -0,0 +1,11 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/send.tsx b/src/themes/teams/components/Icon/svg/icons/send.tsx new file mode 100644 index 0000000000..08ced2b2f6 --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/send.tsx @@ -0,0 +1,20 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/teams.tsx b/src/themes/teams/components/Icon/svg/icons/teams.tsx index c0f35d8696..5c3d5ba8ce 100644 --- a/src/themes/teams/components/Icon/svg/icons/teams.tsx +++ b/src/themes/teams/components/Icon/svg/icons/teams.tsx @@ -3,60 +3,19 @@ import { TeamsSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - + - - - - - - - - + + + ), - styles: { - path: ({ variables: v }) => ({ - fill: v.color, - }), - secondaryPath: ({ variables: v }) => ({ - fill: v.secondaryColor, - }), - }, + styles: {}, } as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/translation.tsx b/src/themes/teams/components/Icon/svg/icons/translation.tsx new file mode 100644 index 0000000000..4d4d801829 --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/translation.tsx @@ -0,0 +1,10 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' +export default { + icon: ({ classes }) => ( + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/trashCan.tsx b/src/themes/teams/components/Icon/svg/icons/trashCan.tsx new file mode 100644 index 0000000000..bc64418df9 --- /dev/null +++ b/src/themes/teams/components/Icon/svg/icons/trashCan.tsx @@ -0,0 +1,20 @@ +import * as React from 'react' +import { TeamsSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + + + + + + + ), + styles: {}, +} as TeamsSvgIconSpec diff --git a/src/themes/teams/components/Icon/svg/icons/umbrella.tsx b/src/themes/teams/components/Icon/svg/icons/umbrella.tsx deleted file mode 100644 index 1f3801584d..0000000000 --- a/src/themes/teams/components/Icon/svg/icons/umbrella.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import * as React from 'react' -import { TeamsSvgIconSpec } from '../types' - -export default { - icon: ({ classes }) => ( - - - - ), - styles: { - svg: ({ variables: v }) => ({ - fill: v.color, - }), - }, -} as TeamsSvgIconSpec