From 068a4f39a045584b66a859446240d2a5fbb98bb8 Mon Sep 17 00:00:00 2001 From: Davey Holler Date: Tue, 15 Jan 2019 15:00:39 -0800 Subject: [PATCH 1/4] new symlink and submodule icons. --- src-docs/src/views/icon/icons.js | 2 ++ src/components/icon/assets/submodule.svg | 3 +++ src/components/icon/assets/symlink.svg | 3 +++ src/components/icon/icon.tsx | 4 ++++ 4 files changed, 12 insertions(+) create mode 100644 src/components/icon/assets/submodule.svg create mode 100644 src/components/icon/assets/symlink.svg diff --git a/src-docs/src/views/icon/icons.js b/src-docs/src/views/icon/icons.js index 80a5f151c32..21c15ec1580 100644 --- a/src-docs/src/views/icon/icons.js +++ b/src-docs/src/views/icon/icons.js @@ -145,6 +145,8 @@ const iconTypes = [ 'stopFilled', 'storage', 'string', + 'submodule', + 'symlink', 'tableOfContents', 'tag', 'tear', diff --git a/src/components/icon/assets/submodule.svg b/src/components/icon/assets/submodule.svg new file mode 100644 index 00000000000..0f0bdf963f0 --- /dev/null +++ b/src/components/icon/assets/submodule.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/symlink.svg b/src/components/icon/assets/symlink.svg new file mode 100644 index 00000000000..1d10a465bc1 --- /dev/null +++ b/src/components/icon/assets/symlink.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index 174494041c7..d3016ef9c02 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -229,6 +229,8 @@ import stop from './assets/stop.svg'; import stopFilled from './assets/stop_filled.svg'; import storage from './assets/storage.svg'; import string from './assets/string.svg'; +import submodule from './assets/submodule.svg'; +import symlink from './assets/symlink.svg'; import tableOfContents from './assets/tableOfContents.svg'; import tag from './assets/tag.svg'; import tear from './assets/tear.svg'; @@ -517,6 +519,8 @@ const typeToIconMap = { stopFilled, storage, string, + submodule, + symlink, tableOfContents, tag, tear, From eb0482cd645b03a3788ea6870377fc1355f12569 Mon Sep 17 00:00:00 2001 From: Davey Holler Date: Tue, 15 Jan 2019 15:05:59 -0800 Subject: [PATCH 2/4] Updating changelog entry. --- CHANGELOG.md | 1 + .../icon/__snapshots__/icon.test.tsx.snap | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a97b3c67ad..413bc3a4fe3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## [`master`](https://github.com/elastic/eui/tree/master) - Added custom date string formatting for series charts crosshair overlay ([#1429](https://github.com/elastic/eui/pull/1429)) +- Added new icons for `symlink` and `submodule` ([#1439](https://github.com/elastic/eui/pull/1439)) ## [`6.3.1`](https://github.com/elastic/eui/tree/v6.3.1) diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index 35dc339c401..b2ead55a62c 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -5484,6 +5484,40 @@ exports[`EuiIcon props type string is rendered 1`] = ` `; +exports[`EuiIcon props type submodule is rendered 1`] = ` + + + +`; + +exports[`EuiIcon props type symlink is rendered 1`] = ` + + + +`; + exports[`EuiIcon props type tableOfContents is rendered 1`] = ` Date: Tue, 15 Jan 2019 15:19:55 -0800 Subject: [PATCH 3/4] Minor tweak to submodule icon. --- src/components/icon/assets/submodule.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/icon/assets/submodule.svg b/src/components/icon/assets/submodule.svg index 0f0bdf963f0..90b2a914206 100644 --- a/src/components/icon/assets/submodule.svg +++ b/src/components/icon/assets/submodule.svg @@ -1,3 +1,3 @@ - + From 70a4b9bc77a52c8cdd0d4952bd22465bb1102f6d Mon Sep 17 00:00:00 2001 From: Davey Holler Date: Wed, 16 Jan 2019 09:37:01 -0800 Subject: [PATCH 4/4] cleaning the test cache and updating the tests. --- src/components/icon/__snapshots__/icon.test.tsx.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index b2ead55a62c..912985bc3f7 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -5496,7 +5496,7 @@ exports[`EuiIcon props type submodule is rendered 1`] = ` > `;