From 1ad8e85581a393451c45b286d69ae4e4b5a76ab8 Mon Sep 17 00:00:00 2001 From: Andrew Martin Date: Tue, 17 Sep 2019 14:46:01 -0700 Subject: [PATCH 1/5] updating brand icons --- .../components/Icon/svg/icons/filesExcel.tsx | 36 +++++- .../Icon/svg/icons/filesExcelBrand.tsx | 110 ++++------------ .../Icon/svg/icons/filesOneNote.tsx | 39 +++++- .../Icon/svg/icons/filesOneNoteBrand.tsx | 108 +++++----------- .../Icon/svg/icons/filesPowerPoint.tsx | 31 ++++- .../Icon/svg/icons/filesPowerPointBrand.tsx | 117 ++++-------------- .../components/Icon/svg/icons/filesVisio.tsx | 41 +++++- .../components/Icon/svg/icons/filesWord.tsx | 38 +++++- .../Icon/svg/icons/filesWordBrand.tsx | 106 +++------------- .../teams/components/Icon/svg/icons/index.ts | 4 +- 10 files changed, 274 insertions(+), 356 deletions(-) diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/filesExcel.tsx b/packages/react/src/themes/teams/components/Icon/svg/icons/filesExcel.tsx index 59d9af5b98..9d43520a56 100644 --- a/packages/react/src/themes/teams/components/Icon/svg/icons/filesExcel.tsx +++ b/packages/react/src/themes/teams/components/Icon/svg/icons/filesExcel.tsx @@ -3,8 +3,40 @@ import { TeamsProcessedSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - + + + + + + + + + + + + + ), styles: {}, diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/filesExcelBrand.tsx b/packages/react/src/themes/teams/components/Icon/svg/icons/filesExcelBrand.tsx index b88de3eec7..8e0aeb7644 100644 --- a/packages/react/src/themes/teams/components/Icon/svg/icons/filesExcelBrand.tsx +++ b/packages/react/src/themes/teams/components/Icon/svg/icons/filesExcelBrand.tsx @@ -4,93 +4,29 @@ import { TeamsProcessedSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + ), styles: {}, diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/filesOneNote.tsx b/packages/react/src/themes/teams/components/Icon/svg/icons/filesOneNote.tsx index 78c93553d2..0bd44f8522 100644 --- a/packages/react/src/themes/teams/components/Icon/svg/icons/filesOneNote.tsx +++ b/packages/react/src/themes/teams/components/Icon/svg/icons/filesOneNote.tsx @@ -3,8 +3,43 @@ import { TeamsProcessedSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - + + + + + + + + + + + + + ), styles: {}, diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/filesOneNoteBrand.tsx b/packages/react/src/themes/teams/components/Icon/svg/icons/filesOneNoteBrand.tsx index 8ee7d39ed1..c005dee049 100644 --- a/packages/react/src/themes/teams/components/Icon/svg/icons/filesOneNoteBrand.tsx +++ b/packages/react/src/themes/teams/components/Icon/svg/icons/filesOneNoteBrand.tsx @@ -4,84 +4,36 @@ import { TeamsProcessedSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + ), styles: {}, diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/filesPowerPoint.tsx b/packages/react/src/themes/teams/components/Icon/svg/icons/filesPowerPoint.tsx index 66d615d01d..af7f77f5da 100644 --- a/packages/react/src/themes/teams/components/Icon/svg/icons/filesPowerPoint.tsx +++ b/packages/react/src/themes/teams/components/Icon/svg/icons/filesPowerPoint.tsx @@ -3,8 +3,35 @@ import { TeamsProcessedSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - + + + + + + + + + + + ), styles: {}, diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/filesPowerPointBrand.tsx b/packages/react/src/themes/teams/components/Icon/svg/icons/filesPowerPointBrand.tsx index 7fc5e38c46..e6abb8f266 100644 --- a/packages/react/src/themes/teams/components/Icon/svg/icons/filesPowerPointBrand.tsx +++ b/packages/react/src/themes/teams/components/Icon/svg/icons/filesPowerPointBrand.tsx @@ -4,97 +4,32 @@ import { TeamsProcessedSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + ), styles: {}, diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/filesVisio.tsx b/packages/react/src/themes/teams/components/Icon/svg/icons/filesVisio.tsx index c07e491472..84c29485f4 100644 --- a/packages/react/src/themes/teams/components/Icon/svg/icons/filesVisio.tsx +++ b/packages/react/src/themes/teams/components/Icon/svg/icons/filesVisio.tsx @@ -3,10 +3,43 @@ import { TeamsSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - - - + + + + + + + + ), styles: {}, diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/filesWord.tsx b/packages/react/src/themes/teams/components/Icon/svg/icons/filesWord.tsx index 9585a2c3ea..17d5ae2b64 100644 --- a/packages/react/src/themes/teams/components/Icon/svg/icons/filesWord.tsx +++ b/packages/react/src/themes/teams/components/Icon/svg/icons/filesWord.tsx @@ -3,8 +3,42 @@ import { TeamsProcessedSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - + + + + + + + + + + + + ), styles: {}, diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/filesWordBrand.tsx b/packages/react/src/themes/teams/components/Icon/svg/icons/filesWordBrand.tsx index df4c8d8bb1..5623ae50da 100644 --- a/packages/react/src/themes/teams/components/Icon/svg/icons/filesWordBrand.tsx +++ b/packages/react/src/themes/teams/components/Icon/svg/icons/filesWordBrand.tsx @@ -4,93 +4,25 @@ import { TeamsProcessedSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + ), styles: {}, diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/index.ts b/packages/react/src/themes/teams/components/Icon/svg/icons/index.ts index 5b4e6cd222..b1ad516c86 100644 --- a/packages/react/src/themes/teams/components/Icon/svg/icons/index.ts +++ b/packages/react/src/themes/teams/components/Icon/svg/icons/index.ts @@ -75,6 +75,7 @@ import filesPowerPointBrand from './filesPowerPointBrand' import filesWord from './filesWord' import filesWordBrand from './filesWordBrand' import filesVisio from './filesVisio' +import filesVisioBrand from './filesVisioBrand' import fontColor from './fontColor' import fontSize from './fontSize' import format from './format' @@ -214,7 +215,6 @@ export default { 'files-txt': filesTxt, 'files-upload': filesUpload, 'files-video': filesVideo, - 'files-visio': filesVisio, 'files-zip': filesZip, flag, download, @@ -319,4 +319,6 @@ export default { 'excel-color': filesExcelBrand, 'powerpoint-color': filesPowerPointBrand, 'onenote-color': filesOneNoteBrand, + visio: filesVisio, + 'visio-color': filesVisioBrand, } as { [iconName: string]: TeamsSvgIconSpec } From 323c9ea0b1422697ac0c70e1fd7b1c8e464276af Mon Sep 17 00:00:00 2001 From: Andrew Martin Date: Wed, 18 Sep 2019 11:15:09 -0700 Subject: [PATCH 2/5] updating visio icons --- .../components/Icon/svg/icons/filesVisio.tsx | 30 +++++------------ .../Icon/svg/icons/filesVisioBrand.tsx | 33 +++++++++++++++++++ 2 files changed, 41 insertions(+), 22 deletions(-) create mode 100644 packages/react/src/themes/teams/components/Icon/svg/icons/filesVisioBrand.tsx diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/filesVisio.tsx b/packages/react/src/themes/teams/components/Icon/svg/icons/filesVisio.tsx index 84c29485f4..4fbba571be 100644 --- a/packages/react/src/themes/teams/components/Icon/svg/icons/filesVisio.tsx +++ b/packages/react/src/themes/teams/components/Icon/svg/icons/filesVisio.tsx @@ -4,41 +4,27 @@ import { TeamsSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( + - + - ), diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/filesVisioBrand.tsx b/packages/react/src/themes/teams/components/Icon/svg/icons/filesVisioBrand.tsx new file mode 100644 index 0000000000..d5d113bbe3 --- /dev/null +++ b/packages/react/src/themes/teams/components/Icon/svg/icons/filesVisioBrand.tsx @@ -0,0 +1,33 @@ +import * as React from 'react' +import { TeamsProcessedSvgIconSpec } from '../types' + +export default { + icon: ({ classes }) => ( + + + + + + + + + + + ), + styles: {}, +} as TeamsProcessedSvgIconSpec From bd4d640953f2b156024dcdf7e57bd28b9814b2da Mon Sep 17 00:00:00 2001 From: Andrew Martin Date: Fri, 20 Sep 2019 11:37:18 -0700 Subject: [PATCH 3/5] updating yammer & onedrive icons, sorting office icons --- .../teams/components/Icon/svg/icons/index.ts | 19 +++++---- .../components/Icon/svg/icons/oneDrive.tsx | 19 ++++++++- .../components/Icon/svg/icons/yammer.tsx | 40 ++++++++++++++++++- 3 files changed, 64 insertions(+), 14 deletions(-) diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/index.ts b/packages/react/src/themes/teams/components/Icon/svg/icons/index.ts index b1ad516c86..1352209f43 100644 --- a/packages/react/src/themes/teams/components/Icon/svg/icons/index.ts +++ b/packages/react/src/themes/teams/components/Icon/svg/icons/index.ts @@ -253,10 +253,8 @@ export default { hand, 'mic-off': micOff, more, - 'microsoft-stream': microsoftStream, 'user-phone': userPhone, 'number-list': numberList, - onedrive: oneDrive, 'open-outside': openOutside, outdent, paperclip, @@ -278,7 +276,6 @@ export default { 'remove-format': removeFormat, reply, retry, - 'skype-logo': skypeLogo, search, send, settings, @@ -304,21 +301,23 @@ export default { 'user-blur': userBlur, 'user-friends': userFriends, 'video-camera-emphasis': videoCameraEmphasis, - yammer, 'window-maximize': windowMaximize, 'window-minimize': windowMinimize, 'window-restore': windowRestore, // Office icons - word: filesWord, excel: filesExcel, - powerpoint: filesPowerPoint, - onenote: filesOneNote, - - 'word-color': filesWordBrand, 'excel-color': filesExcelBrand, - 'powerpoint-color': filesPowerPointBrand, + onedrive: oneDrive, + onenote: filesOneNote, 'onenote-color': filesOneNoteBrand, + powerpoint: filesPowerPoint, + 'powerpoint-color': filesPowerPointBrand, + 'skype-logo': skypeLogo, + 'microsoft-stream': microsoftStream, + word: filesWord, + 'word-color': filesWordBrand, + yammer, visio: filesVisio, 'visio-color': filesVisioBrand, } as { [iconName: string]: TeamsSvgIconSpec } diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/oneDrive.tsx b/packages/react/src/themes/teams/components/Icon/svg/icons/oneDrive.tsx index 7e7fff1e00..40475b7aeb 100644 --- a/packages/react/src/themes/teams/components/Icon/svg/icons/oneDrive.tsx +++ b/packages/react/src/themes/teams/components/Icon/svg/icons/oneDrive.tsx @@ -3,8 +3,23 @@ import { TeamsProcessedSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - + + + + + ), styles: {}, diff --git a/packages/react/src/themes/teams/components/Icon/svg/icons/yammer.tsx b/packages/react/src/themes/teams/components/Icon/svg/icons/yammer.tsx index 5ec75cbe25..f7e8e03f86 100644 --- a/packages/react/src/themes/teams/components/Icon/svg/icons/yammer.tsx +++ b/packages/react/src/themes/teams/components/Icon/svg/icons/yammer.tsx @@ -3,8 +3,44 @@ import { TeamsProcessedSvgIconSpec } from '../types' export default { icon: ({ classes }) => ( - - + + + + + + + + + + + ), styles: {}, From 012314d9e17afbaa98fda4876b927647b93011a3 Mon Sep 17 00:00:00 2001 From: Andrew Martin Date: Fri, 20 Sep 2019 13:32:30 -0700 Subject: [PATCH 4/5] adding changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7eb505fe6..61c35d289b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Fix styles for Teams theme for `Textarea` and add support for `inverted`, `fluid` and `resize` props @codepretty ([#1922](https://github.com/stardust-ui/react/pull/1922)) - Fix `Dropdown` to properly accept `id` on `searchInput` @silviuavram ([#1938](https://github.com/stardust-ui/react/pull/1938)) - Fix white flash when activating `Embed` component @lucivpav ([#1909](https://github.com/stardust-ui/react/pull/1909)) +- Update Office brand icons with latest version @notandrew ([#1954](https://github.com/stardust-ui/react/pull/1954)) ### Features - Add `TextArea` component @lucivpav ([#1897](https://github.com/stardust-ui/react/pull/1897)) From ea511ebd2624f2875dcb593bb206b9961374bb70 Mon Sep 17 00:00:00 2001 From: Andrew Martin Date: Tue, 24 Sep 2019 10:58:41 -0700 Subject: [PATCH 5/5] fixing changelog entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9603a1cb1f..26daf69618 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Fixes - Fix comparison for `scrollParent` in `unstable_Popper` @layershifter ([#1959](https://github.com/stardust-ui/react/pull/1959)) +- Update Office brand icons in Teams theme with latest version @notandrew ([#1954](https://github.com/stardust-ui/react/pull/1954)) ## [v0.39.0](https://github.com/stardust-ui/react/tree/v0.39.0) (2019-09-23) @@ -35,7 +36,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Fix styles for Teams theme for `Textarea` and add support for `inverted`, `fluid` and `resize` props @codepretty ([#1922](https://github.com/stardust-ui/react/pull/1922)) - Fix `Dropdown` to properly accept `id` on `searchInput` @silviuavram ([#1938](https://github.com/stardust-ui/react/pull/1938)) - Fix white flash when activating `Embed` component @lucivpav ([#1909](https://github.com/stardust-ui/react/pull/1909)) -- Update Office brand icons in Teams theme with latest version @notandrew ([#1954](https://github.com/stardust-ui/react/pull/1954)) - Fix comparison of custom objects in `Dropdown` @lucivpav ([#1943](https://github.com/stardust-ui/react/pull/1943)) - Fix make `tooltip` visible for screen reader @kolaps33 ([#1942](https://github.com/stardust-ui/react/pull/1942))