From c1d6c8f8107eab4ab604e9d8b9d1d99db9bdf8bb Mon Sep 17 00:00:00 2001 From: Davey Holler Date: Wed, 23 Jan 2019 13:28:24 -0800 Subject: [PATCH 1/5] Adding the code app icon --- src-docs/src/views/icon/apps.js | 1 + src/components/icon/assets/app_code.svg | 7 +++++++ src/components/icon/icon.tsx | 2 ++ 3 files changed, 10 insertions(+) create mode 100644 src/components/icon/assets/app_code.svg diff --git a/src-docs/src/views/icon/apps.js b/src-docs/src/views/icon/apps.js index f6e8a0a842b..d3d00b7a919 100644 --- a/src-docs/src/views/icon/apps.js +++ b/src-docs/src/views/icon/apps.js @@ -14,6 +14,7 @@ const iconTypes = [ 'apmApp', 'auditbeatApp', 'canvasApp', + 'codeApp', 'consoleApp', 'crossClusterReplicationApp', 'dashboardApp', diff --git a/src/components/icon/assets/app_code.svg b/src/components/icon/assets/app_code.svg new file mode 100644 index 00000000000..47dd29b1f57 --- /dev/null +++ b/src/components/icon/assets/app_code.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index c3593d116cb..7152d008c2d 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -26,6 +26,7 @@ import brush from './assets/brush.svg'; import bullseye from './assets/bullseye.svg'; import calendar from './assets/calendar.svg'; import canvasApp from './assets/app_canvas.svg'; +import codeApp from './assets/app_code.svg'; import check from './assets/check.svg'; import checkInCircleFilled from './assets/checkInCircleFilled.svg'; import clock from './assets/clock.svg'; @@ -320,6 +321,7 @@ const typeToIconMap = { bullseye, calendar, canvasApp, + codeApp, check, checkInCircleFilled, clock, From c05ae1a43a3b49f47e01b49b299468b37b993963 Mon Sep 17 00:00:00 2001 From: Davey Holler Date: Wed, 23 Jan 2019 13:38:53 -0800 Subject: [PATCH 2/5] Fixing the fills on the svg to match EUI's pattern --- .../icon/__snapshots__/icon.test.tsx.snap | 32 +++++++++++++++++++ src/components/icon/assets/app_code.svg | 8 ++--- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index f000989841c..4ecf2c7a9f2 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -909,6 +909,38 @@ exports[`EuiIcon props type clock is rendered 1`] = ` `; +exports[`EuiIcon props type codeApp is rendered 1`] = ` + + + + + + + +`; + exports[`EuiIcon props type compute is rendered 1`] = ` - - - - + + + + \ No newline at end of file From a5353bcafcfba7f2a07b8ff88d01affe529744d5 Mon Sep 17 00:00:00 2001 From: Davey Holler Date: Wed, 23 Jan 2019 13:49:01 -0800 Subject: [PATCH 3/5] Updating changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 700433517a7..1aca10be125 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## [`master`](https://github.com/elastic/eui/tree/master) +- Added a new app icon for Code ([#1467](https://github.com/elastic/eui/pull/1467)) No public interface changes since `6.6.0`. ## [`6.6.0`](https://github.com/elastic/eui/tree/v6.6.0) From fde619c84cb8c92273c396a371f9ab086c42ef67 Mon Sep 17 00:00:00 2001 From: Caroline Horn <549577+cchaos@users.noreply.github.com> Date: Wed, 23 Jan 2019 14:10:23 -0800 Subject: [PATCH 4/5] Update src/components/icon/assets/app_code.svg Co-Authored-By: daveyholler --- src/components/icon/assets/app_code.svg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/icon/assets/app_code.svg b/src/components/icon/assets/app_code.svg index 4a28821f413..1970a61821c 100644 --- a/src/components/icon/assets/app_code.svg +++ b/src/components/icon/assets/app_code.svg @@ -1,7 +1,7 @@ - + - \ No newline at end of file + From a9dd42daa0eb38f678e1c773f70afa5721a065db Mon Sep 17 00:00:00 2001 From: Davey Holler Date: Wed, 23 Jan 2019 15:01:38 -0800 Subject: [PATCH 5/5] Merging master. --- .../icon/__snapshots__/icon.test.tsx.snap | 29 +++++-------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index 4ecf2c7a9f2..7311fe92320 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -916,28 +916,15 @@ exports[`EuiIcon props type codeApp is rendered 1`] = ` height="32" viewBox="0 0 32 32" width="32" + xmlns="http://www.w3.org/2000/svg" > - - - - - + + `;