From 53916bb5c838e72a0bedf467059bf4fd220cd087 Mon Sep 17 00:00:00 2001 From: Clara Udofa Date: Wed, 10 Jul 2019 13:47:37 +0100 Subject: [PATCH 1/3] Add new icons update changelog Per PR review - Update new icons to icon design specs --- CHANGELOG.md | 1 + src-docs/src/views/icon/icons.js | 7 + .../icon/__snapshots__/icon.test.tsx.snap | 165 ++++++++++++++++++ src/components/icon/assets/cloud-drizzle.js | 17 ++ src/components/icon/assets/cloud-drizzle.svg | 6 + src/components/icon/assets/cloud-stormy.js | 17 ++ src/components/icon/assets/cloud-stormy.svg | 6 + src/components/icon/assets/cloud-sunny.js | 14 ++ src/components/icon/assets/cloud-sunny.svg | 3 + src/components/icon/assets/documents.js | 17 ++ src/components/icon/assets/documents.svg | 6 + src/components/icon/assets/edit.js | 26 +++ src/components/icon/assets/edit.svg | 11 ++ src/components/icon/assets/training.js | 18 ++ src/components/icon/assets/training.svg | 7 + src/components/icon/assets/video-player.js | 17 ++ src/components/icon/assets/video-player.svg | 6 + src/components/icon/icon.tsx | 7 + 18 files changed, 351 insertions(+) create mode 100644 src/components/icon/assets/cloud-drizzle.js create mode 100755 src/components/icon/assets/cloud-drizzle.svg create mode 100644 src/components/icon/assets/cloud-stormy.js create mode 100755 src/components/icon/assets/cloud-stormy.svg create mode 100644 src/components/icon/assets/cloud-sunny.js create mode 100755 src/components/icon/assets/cloud-sunny.svg create mode 100644 src/components/icon/assets/documents.js create mode 100755 src/components/icon/assets/documents.svg create mode 100644 src/components/icon/assets/edit.js create mode 100755 src/components/icon/assets/edit.svg create mode 100644 src/components/icon/assets/training.js create mode 100755 src/components/icon/assets/training.svg create mode 100644 src/components/icon/assets/video-player.js create mode 100755 src/components/icon/assets/video-player.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index ecd11fd0531..de7235a8e0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Added TypeScript definition for `EuiFormControlLayout` ([#2086](https://github.com/elastic/eui/pull/2086)) - Changed SASS mixin `euiOverflowShadow()` to use `mask-image` instead of `box-shadow` ([#2088](https://github.com/elastic/eui/pull/2088)) - Added SASS mixin and CSS utility `euiYScrollWithShadows` ([#2088](https://github.com/elastic/eui/pull/2088)) +- Added new icons `cloud drizzle`, `cloud stormy`, `cloud sunny`, `documents`, `edit `, `training` and `video player` ([#2102](https://github.com/elastic/eui/pull/2102)) **Bug fixes** diff --git a/src-docs/src/views/icon/icons.js b/src-docs/src/views/icon/icons.js index 73db7f649a2..3b19cbcf1b9 100644 --- a/src-docs/src/views/icon/icons.js +++ b/src-docs/src/views/icon/icons.js @@ -43,6 +43,9 @@ const iconTypes = [ 'check', 'checkInCircleFilled', 'clock', + 'cloudDrizzle', + 'cloudStormy', + 'cloudSunny', 'compute', 'console', 'controlsHorizontal', @@ -55,7 +58,9 @@ const iconTypes = [ 'cut', 'database', 'document', + 'documents', 'dot', + 'edit', 'email', 'empty', 'exit', @@ -161,9 +166,11 @@ const iconTypes = [ 'tag', 'tear', 'temperature', + 'training', 'trash', 'user', 'vector', + 'videoPlayer', 'visArea', 'visBarHorizontal', 'visBarVertical', diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index 919bf81dbde..42349cc1f7d 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -1040,6 +1040,67 @@ exports[`EuiIcon props type clock is rendered 1`] = ` `; +exports[`EuiIcon props type cloudDrizzle is rendered 1`] = ` + + + + + + +`; + +exports[`EuiIcon props type cloudStormy is rendered 1`] = ` + + + + + + +`; + +exports[`EuiIcon props type cloudSunny is rendered 1`] = ` + + + +`; + exports[`EuiIcon props type codeApp is rendered 1`] = ` `; +exports[`EuiIcon props type documents is rendered 1`] = ` + + + + + + +`; + exports[`EuiIcon props type dot is rendered 1`] = ` `; +exports[`EuiIcon props type edit is rendered 1`] = ` + + + + + + + +`; + exports[`EuiIcon props type editorAlignCenter is rendered 1`] = ` `; +exports[`EuiIcon props type training is rendered 1`] = ` + + + + + + + +`; + exports[`EuiIcon props type trash is rendered 1`] = ` `; +exports[`EuiIcon props type videoPlayer is rendered 1`] = ` + + + + + + +`; + exports[`EuiIcon props type visArea is rendered 1`] = ` ( + + + + + + +); + +export const icon = EuiIconCloudDrizzle; diff --git a/src/components/icon/assets/cloud-drizzle.svg b/src/components/icon/assets/cloud-drizzle.svg new file mode 100755 index 00000000000..0afb8e64b66 --- /dev/null +++ b/src/components/icon/assets/cloud-drizzle.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/components/icon/assets/cloud-stormy.js b/src/components/icon/assets/cloud-stormy.js new file mode 100644 index 00000000000..3922386e225 --- /dev/null +++ b/src/components/icon/assets/cloud-stormy.js @@ -0,0 +1,17 @@ +import React from 'react'; + +const EuiIconCloudStormy = props => ( + + + + + + +); + +export const icon = EuiIconCloudStormy; diff --git a/src/components/icon/assets/cloud-stormy.svg b/src/components/icon/assets/cloud-stormy.svg new file mode 100755 index 00000000000..fc8562f31a0 --- /dev/null +++ b/src/components/icon/assets/cloud-stormy.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/components/icon/assets/cloud-sunny.js b/src/components/icon/assets/cloud-sunny.js new file mode 100644 index 00000000000..c7e8aadf5eb --- /dev/null +++ b/src/components/icon/assets/cloud-sunny.js @@ -0,0 +1,14 @@ +import React from 'react'; + +const EuiIconCloudSunny = props => ( + + + +); + +export const icon = EuiIconCloudSunny; diff --git a/src/components/icon/assets/cloud-sunny.svg b/src/components/icon/assets/cloud-sunny.svg new file mode 100755 index 00000000000..b2a63124577 --- /dev/null +++ b/src/components/icon/assets/cloud-sunny.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/documents.js b/src/components/icon/assets/documents.js new file mode 100644 index 00000000000..f5f6a2b9d46 --- /dev/null +++ b/src/components/icon/assets/documents.js @@ -0,0 +1,17 @@ +import React from 'react'; + +const EuiIconDocuments = props => ( + + + + + + +); + +export const icon = EuiIconDocuments; diff --git a/src/components/icon/assets/documents.svg b/src/components/icon/assets/documents.svg new file mode 100755 index 00000000000..4d917490e59 --- /dev/null +++ b/src/components/icon/assets/documents.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/components/icon/assets/edit.js b/src/components/icon/assets/edit.js new file mode 100644 index 00000000000..3335322dda6 --- /dev/null +++ b/src/components/icon/assets/edit.js @@ -0,0 +1,26 @@ +import React from 'react'; + +const EuiIconEdit = props => ( + + + + + + + +); + +export const icon = EuiIconEdit; diff --git a/src/components/icon/assets/edit.svg b/src/components/icon/assets/edit.svg new file mode 100755 index 00000000000..fd34c889cb1 --- /dev/null +++ b/src/components/icon/assets/edit.svg @@ -0,0 +1,11 @@ + + + + icon-blog-16-ink + Created with Sketch. + + + + + + \ No newline at end of file diff --git a/src/components/icon/assets/training.js b/src/components/icon/assets/training.js new file mode 100644 index 00000000000..af6b4867cfe --- /dev/null +++ b/src/components/icon/assets/training.js @@ -0,0 +1,18 @@ +import React from 'react'; + +const EuiIconTraining = props => ( + + + + + + + +); + +export const icon = EuiIconTraining; diff --git a/src/components/icon/assets/training.svg b/src/components/icon/assets/training.svg new file mode 100755 index 00000000000..d470f5150f2 --- /dev/null +++ b/src/components/icon/assets/training.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/components/icon/assets/video-player.js b/src/components/icon/assets/video-player.js new file mode 100644 index 00000000000..8266abaf68b --- /dev/null +++ b/src/components/icon/assets/video-player.js @@ -0,0 +1,17 @@ +import React from 'react'; + +const EuiIconVideoPlayer = props => ( + + + + + + +); + +export const icon = EuiIconVideoPlayer; diff --git a/src/components/icon/assets/video-player.svg b/src/components/icon/assets/video-player.svg new file mode 100755 index 00000000000..e5c45033b61 --- /dev/null +++ b/src/components/icon/assets/video-player.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index 0848b9cd049..a9c62ab11d0 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -45,6 +45,9 @@ const typeToPathMap = { check: 'check', checkInCircleFilled: 'checkInCircleFilled', clock: 'clock', + cloudDrizzle: 'cloud-drizzle', + cloudStormy: 'cloud-stormy', + cloudSunny: 'cloud-sunny', compute: 'compute', console: 'console', consoleApp: 'app_console', @@ -67,7 +70,9 @@ const typeToPathMap = { devToolsApp: 'app_devtools', discoverApp: 'app_discover', document: 'document', + documents: 'documents', dot: 'dot', + edit: 'edit', editorAlignCenter: 'editor_align_center', editorAlignLeft: 'editor_align_left', editorAlignRight: 'editor_align_right', @@ -280,12 +285,14 @@ const typeToPathMap = { tear: 'tear', temperature: 'temperature', timelionApp: 'app_timelion', + training: 'training', trash: 'trash', upgradeAssistantApp: 'app_upgrade_assistant', uptimeApp: 'app_uptime', user: 'user', usersRolesApp: 'app_users_roles', vector: 'vector', + videoPlayer: 'video-player', visArea: 'vis_area', visBarHorizontal: 'vis_bar_horizontal', visBarVertical: 'vis_bar_vertical', From 1e14155e3b0034a7e7667178ab6875b1b6652cc1 Mon Sep 17 00:00:00 2001 From: Ryan Keairns Date: Tue, 16 Jul 2019 10:32:34 -0500 Subject: [PATCH 2/3] retina tweaks, renames, euify --- CHANGELOG.md | 2 +- src-docs/src/views/icon/icons.js | 2 +- .../icon/__snapshots__/icon.test.tsx.snap | 122 +++++------------- src/components/icon/assets/cloud-drizzle.js | 17 --- src/components/icon/assets/cloud-drizzle.svg | 6 - src/components/icon/assets/cloud-stormy.js | 17 --- src/components/icon/assets/cloud-stormy.svg | 6 - src/components/icon/assets/cloudDrizzle.js | 14 ++ src/components/icon/assets/cloudDrizzle.svg | 3 + src/components/icon/assets/cloudStormy.js | 14 ++ src/components/icon/assets/cloudStormy.svg | 3 + .../assets/{cloud-sunny.js => cloudSunny.js} | 2 +- .../{cloud-sunny.svg => cloudSunny.svg} | 2 +- src/components/icon/assets/documentEdit.js | 14 ++ src/components/icon/assets/documentEdit.svg | 3 + src/components/icon/assets/documents.js | 5 +- src/components/icon/assets/documents.svg | 5 +- src/components/icon/assets/edit.js | 26 ---- src/components/icon/assets/edit.svg | 11 -- src/components/icon/assets/training.js | 6 +- src/components/icon/assets/training.svg | 6 +- src/components/icon/assets/video-player.js | 17 --- src/components/icon/assets/video-player.svg | 6 - src/components/icon/assets/videoPlayer.js | 14 ++ src/components/icon/assets/videoPlayer.svg | 3 + src/components/icon/icon.tsx | 10 +- 26 files changed, 112 insertions(+), 224 deletions(-) delete mode 100644 src/components/icon/assets/cloud-drizzle.js delete mode 100755 src/components/icon/assets/cloud-drizzle.svg delete mode 100644 src/components/icon/assets/cloud-stormy.js delete mode 100755 src/components/icon/assets/cloud-stormy.svg create mode 100644 src/components/icon/assets/cloudDrizzle.js create mode 100644 src/components/icon/assets/cloudDrizzle.svg create mode 100644 src/components/icon/assets/cloudStormy.js create mode 100644 src/components/icon/assets/cloudStormy.svg rename src/components/icon/assets/{cloud-sunny.js => cloudSunny.js} (72%) rename src/components/icon/assets/{cloud-sunny.svg => cloudSunny.svg} (61%) mode change 100755 => 100644 create mode 100644 src/components/icon/assets/documentEdit.js create mode 100644 src/components/icon/assets/documentEdit.svg mode change 100755 => 100644 src/components/icon/assets/documents.svg delete mode 100644 src/components/icon/assets/edit.js delete mode 100755 src/components/icon/assets/edit.svg mode change 100755 => 100644 src/components/icon/assets/training.svg delete mode 100644 src/components/icon/assets/video-player.js delete mode 100755 src/components/icon/assets/video-player.svg create mode 100644 src/components/icon/assets/videoPlayer.js create mode 100644 src/components/icon/assets/videoPlayer.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index de7235a8e0e..9b21b673278 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ - Added TypeScript definition for `EuiFormControlLayout` ([#2086](https://github.com/elastic/eui/pull/2086)) - Changed SASS mixin `euiOverflowShadow()` to use `mask-image` instead of `box-shadow` ([#2088](https://github.com/elastic/eui/pull/2088)) - Added SASS mixin and CSS utility `euiYScrollWithShadows` ([#2088](https://github.com/elastic/eui/pull/2088)) -- Added new icons `cloud drizzle`, `cloud stormy`, `cloud sunny`, `documents`, `edit `, `training` and `video player` ([#2102](https://github.com/elastic/eui/pull/2102)) +- Added `cloudDrizzle`, `cloudStormy`, `cloudSunny`, `documents`, `documentEdit`, `training` and `videoPlayer` glyphs to `EuiIcon` ([#2102](https://github.com/elastic/eui/pull/2102)) **Bug fixes** diff --git a/src-docs/src/views/icon/icons.js b/src-docs/src/views/icon/icons.js index 3b19cbcf1b9..6cd50be25b1 100644 --- a/src-docs/src/views/icon/icons.js +++ b/src-docs/src/views/icon/icons.js @@ -58,9 +58,9 @@ const iconTypes = [ 'cut', 'database', 'document', + 'documentEdit', 'documents', 'dot', - 'edit', 'email', 'empty', 'exit', diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index 42349cc1f7d..08b065d78b8 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -1049,17 +1049,9 @@ exports[`EuiIcon props type cloudDrizzle is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - + `; @@ -1072,17 +1064,9 @@ exports[`EuiIcon props type cloudStormy is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - + `; @@ -1096,7 +1080,7 @@ exports[`EuiIcon props type cloudSunny is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -1534,7 +1518,7 @@ exports[`EuiIcon props type document is rendered 1`] = ` `; -exports[`EuiIcon props type documents is rendered 1`] = ` +exports[`EuiIcon props type documentEdit is rendered 1`] = ` - - - - + `; -exports[`EuiIcon props type dot is rendered 1`] = ` +exports[`EuiIcon props type documents is rendered 1`] = ` - - - - `; -exports[`EuiIcon props type edit is rendered 1`] = ` +exports[`EuiIcon props type dot is rendered 1`] = ` - - - - + - + + `; @@ -6749,20 +6708,9 @@ exports[`EuiIcon props type training is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - - + `; @@ -6890,17 +6838,9 @@ exports[`EuiIcon props type videoPlayer is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - + `; diff --git a/src/components/icon/assets/cloud-drizzle.js b/src/components/icon/assets/cloud-drizzle.js deleted file mode 100644 index 71f57823651..00000000000 --- a/src/components/icon/assets/cloud-drizzle.js +++ /dev/null @@ -1,17 +0,0 @@ -import React from 'react'; - -const EuiIconCloudDrizzle = props => ( - - - - - - -); - -export const icon = EuiIconCloudDrizzle; diff --git a/src/components/icon/assets/cloud-drizzle.svg b/src/components/icon/assets/cloud-drizzle.svg deleted file mode 100755 index 0afb8e64b66..00000000000 --- a/src/components/icon/assets/cloud-drizzle.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/components/icon/assets/cloud-stormy.js b/src/components/icon/assets/cloud-stormy.js deleted file mode 100644 index 3922386e225..00000000000 --- a/src/components/icon/assets/cloud-stormy.js +++ /dev/null @@ -1,17 +0,0 @@ -import React from 'react'; - -const EuiIconCloudStormy = props => ( - - - - - - -); - -export const icon = EuiIconCloudStormy; diff --git a/src/components/icon/assets/cloud-stormy.svg b/src/components/icon/assets/cloud-stormy.svg deleted file mode 100755 index fc8562f31a0..00000000000 --- a/src/components/icon/assets/cloud-stormy.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/components/icon/assets/cloudDrizzle.js b/src/components/icon/assets/cloudDrizzle.js new file mode 100644 index 00000000000..70962d7f46e --- /dev/null +++ b/src/components/icon/assets/cloudDrizzle.js @@ -0,0 +1,14 @@ +import React from 'react'; + +const EuiIconCloudDrizzle = props => ( + + + +); + +export const icon = EuiIconCloudDrizzle; diff --git a/src/components/icon/assets/cloudDrizzle.svg b/src/components/icon/assets/cloudDrizzle.svg new file mode 100644 index 00000000000..551d1b68327 --- /dev/null +++ b/src/components/icon/assets/cloudDrizzle.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/cloudStormy.js b/src/components/icon/assets/cloudStormy.js new file mode 100644 index 00000000000..a76e9aa40ad --- /dev/null +++ b/src/components/icon/assets/cloudStormy.js @@ -0,0 +1,14 @@ +import React from 'react'; + +const EuiIconCloudStormy = props => ( + + + +); + +export const icon = EuiIconCloudStormy; diff --git a/src/components/icon/assets/cloudStormy.svg b/src/components/icon/assets/cloudStormy.svg new file mode 100644 index 00000000000..6ff20500f12 --- /dev/null +++ b/src/components/icon/assets/cloudStormy.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/cloud-sunny.js b/src/components/icon/assets/cloudSunny.js similarity index 72% rename from src/components/icon/assets/cloud-sunny.js rename to src/components/icon/assets/cloudSunny.js index c7e8aadf5eb..7fd0613feee 100644 --- a/src/components/icon/assets/cloud-sunny.js +++ b/src/components/icon/assets/cloudSunny.js @@ -7,7 +7,7 @@ const EuiIconCloudSunny = props => ( viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" {...props}> - + ); diff --git a/src/components/icon/assets/cloud-sunny.svg b/src/components/icon/assets/cloudSunny.svg old mode 100755 new mode 100644 similarity index 61% rename from src/components/icon/assets/cloud-sunny.svg rename to src/components/icon/assets/cloudSunny.svg index b2a63124577..0935e1e1adc --- a/src/components/icon/assets/cloud-sunny.svg +++ b/src/components/icon/assets/cloudSunny.svg @@ -1,3 +1,3 @@ - + diff --git a/src/components/icon/assets/documentEdit.js b/src/components/icon/assets/documentEdit.js new file mode 100644 index 00000000000..7046b93137a --- /dev/null +++ b/src/components/icon/assets/documentEdit.js @@ -0,0 +1,14 @@ +import React from 'react'; + +const EuiIconDocumentEdit = props => ( + + + +); + +export const icon = EuiIconDocumentEdit; diff --git a/src/components/icon/assets/documentEdit.svg b/src/components/icon/assets/documentEdit.svg new file mode 100644 index 00000000000..5dd7ded0f89 --- /dev/null +++ b/src/components/icon/assets/documentEdit.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/documents.js b/src/components/icon/assets/documents.js index f5f6a2b9d46..1916f84c877 100644 --- a/src/components/icon/assets/documents.js +++ b/src/components/icon/assets/documents.js @@ -7,10 +7,7 @@ const EuiIconDocuments = props => ( viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" {...props}> - - - - + ); diff --git a/src/components/icon/assets/documents.svg b/src/components/icon/assets/documents.svg old mode 100755 new mode 100644 index 4d917490e59..09a08cfbabf --- a/src/components/icon/assets/documents.svg +++ b/src/components/icon/assets/documents.svg @@ -1,6 +1,3 @@ - - - - + diff --git a/src/components/icon/assets/edit.js b/src/components/icon/assets/edit.js deleted file mode 100644 index 3335322dda6..00000000000 --- a/src/components/icon/assets/edit.js +++ /dev/null @@ -1,26 +0,0 @@ -import React from 'react'; - -const EuiIconEdit = props => ( - - - - - - - -); - -export const icon = EuiIconEdit; diff --git a/src/components/icon/assets/edit.svg b/src/components/icon/assets/edit.svg deleted file mode 100755 index fd34c889cb1..00000000000 --- a/src/components/icon/assets/edit.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - icon-blog-16-ink - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/src/components/icon/assets/training.js b/src/components/icon/assets/training.js index af6b4867cfe..90f7b131a32 100644 --- a/src/components/icon/assets/training.js +++ b/src/components/icon/assets/training.js @@ -7,11 +7,7 @@ const EuiIconTraining = props => ( viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" {...props}> - - - - - + ); diff --git a/src/components/icon/assets/training.svg b/src/components/icon/assets/training.svg old mode 100755 new mode 100644 index d470f5150f2..0205c51e15c --- a/src/components/icon/assets/training.svg +++ b/src/components/icon/assets/training.svg @@ -1,7 +1,3 @@ - - - - - + diff --git a/src/components/icon/assets/video-player.js b/src/components/icon/assets/video-player.js deleted file mode 100644 index 8266abaf68b..00000000000 --- a/src/components/icon/assets/video-player.js +++ /dev/null @@ -1,17 +0,0 @@ -import React from 'react'; - -const EuiIconVideoPlayer = props => ( - - - - - - -); - -export const icon = EuiIconVideoPlayer; diff --git a/src/components/icon/assets/video-player.svg b/src/components/icon/assets/video-player.svg deleted file mode 100755 index e5c45033b61..00000000000 --- a/src/components/icon/assets/video-player.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/components/icon/assets/videoPlayer.js b/src/components/icon/assets/videoPlayer.js new file mode 100644 index 00000000000..82cf1002353 --- /dev/null +++ b/src/components/icon/assets/videoPlayer.js @@ -0,0 +1,14 @@ +import React from 'react'; + +const EuiIconVideoPlayer = props => ( + + + +); + +export const icon = EuiIconVideoPlayer; diff --git a/src/components/icon/assets/videoPlayer.svg b/src/components/icon/assets/videoPlayer.svg new file mode 100644 index 00000000000..6f2ec5e420f --- /dev/null +++ b/src/components/icon/assets/videoPlayer.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index a9c62ab11d0..7c8ac598e17 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -45,9 +45,9 @@ const typeToPathMap = { check: 'check', checkInCircleFilled: 'checkInCircleFilled', clock: 'clock', - cloudDrizzle: 'cloud-drizzle', - cloudStormy: 'cloud-stormy', - cloudSunny: 'cloud-sunny', + cloudDrizzle: 'cloudDrizzle', + cloudStormy: 'cloudStormy', + cloudSunny: 'cloudSunny', compute: 'compute', console: 'console', consoleApp: 'app_console', @@ -70,9 +70,9 @@ const typeToPathMap = { devToolsApp: 'app_devtools', discoverApp: 'app_discover', document: 'document', + documentEdit: 'documentEdit', documents: 'documents', dot: 'dot', - edit: 'edit', editorAlignCenter: 'editor_align_center', editorAlignLeft: 'editor_align_left', editorAlignRight: 'editor_align_right', @@ -292,7 +292,7 @@ const typeToPathMap = { user: 'user', usersRolesApp: 'app_users_roles', vector: 'vector', - videoPlayer: 'video-player', + videoPlayer: 'videoPlayer', visArea: 'vis_area', visBarHorizontal: 'vis_bar_horizontal', visBarVertical: 'vis_bar_vertical', From c4ddba1c0638a9d5555392756c04169c2147ec77 Mon Sep 17 00:00:00 2001 From: Ryan Keairns Date: Tue, 16 Jul 2019 11:09:17 -0500 Subject: [PATCH 3/3] re-shape cloud --- src/components/icon/__snapshots__/icon.test.tsx.snap | 2 +- src/components/icon/assets/cloudStormy.js | 2 +- src/components/icon/assets/cloudStormy.svg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index 08b065d78b8..2c3afc4360f 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -1065,7 +1065,7 @@ exports[`EuiIcon props type cloudStormy is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; diff --git a/src/components/icon/assets/cloudStormy.js b/src/components/icon/assets/cloudStormy.js index a76e9aa40ad..64122410cc7 100644 --- a/src/components/icon/assets/cloudStormy.js +++ b/src/components/icon/assets/cloudStormy.js @@ -7,7 +7,7 @@ const EuiIconCloudStormy = props => ( viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" {...props}> - + ); diff --git a/src/components/icon/assets/cloudStormy.svg b/src/components/icon/assets/cloudStormy.svg index 6ff20500f12..250480b6592 100644 --- a/src/components/icon/assets/cloudStormy.svg +++ b/src/components/icon/assets/cloudStormy.svg @@ -1,3 +1,3 @@ - +