From 560abe48e0f8505b11b5207df058056ff0668487 Mon Sep 17 00:00:00 2001 From: "dave.snider@gmail.com" Date: Tue, 5 Jun 2018 16:06:17 -0700 Subject: [PATCH] New cloud icons (#906) cloud updated, cloud ece added. --- CHANGELOG.md | 1 + src-docs/src/views/icon/logos.js | 1 + .../icon/__snapshots__/icon.test.js.snap | 61 ++++++++++++++++--- src/components/icon/assets/logo_cloud.svg | 10 +-- src/components/icon/assets/logo_cloud_ece.svg | 10 +++ src/components/icon/icon.js | 2 + 6 files changed, 70 insertions(+), 15 deletions(-) create mode 100644 src/components/icon/assets/logo_cloud_ece.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index bc842a23326..3f117762cc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## [`master`](https://github.com/elastic/eui/tree/master) +- Added updated logos for Cloud and Cloud ECE ([#906](https://github.com/elastic/eui/pull/906)) - Added the ability for `EuiBetaBadge` to appear on `EuiPanel` similar to `EuiCard` ([#885](https://github.com/elastic/eui/pull/888)) - Added `restrictWidth` to `EuiPage` ([#896](https://github.com/elastic/eui/pull/896)) - Added `resize` prop to `EuiTextArea` that defaults to ‘vertical’ (only height) ([#894](https://github.com/elastic/eui/pull/894)) diff --git a/src-docs/src/views/icon/logos.js b/src-docs/src/views/icon/logos.js index c3485384b16..c993b80c056 100644 --- a/src-docs/src/views/icon/logos.js +++ b/src-docs/src/views/icon/logos.js @@ -12,6 +12,7 @@ const iconTypes = [ 'logoApache', 'logoBeats', 'logoCloud', + 'logoCloudEnterprise', 'logoDocker', 'logoElastic', 'logoElasticsearch', diff --git a/src/components/icon/__snapshots__/icon.test.js.snap b/src/components/icon/__snapshots__/icon.test.js.snap index 95165a26a5d..0f063ded31e 100644 --- a/src/components/icon/__snapshots__/icon.test.js.snap +++ b/src/components/icon/__snapshots__/icon.test.js.snap @@ -2663,24 +2663,65 @@ exports[`EuiIcon props type logoCloud is rendered 1`] = ` fill="none" > + + +`; + +exports[`EuiIcon props type logoCloudEnterprise is rendered 1`] = ` + + + + + + + + diff --git a/src/components/icon/assets/logo_cloud.svg b/src/components/icon/assets/logo_cloud.svg index 1e2a47c07d1..a0ca2c1cc65 100644 --- a/src/components/icon/assets/logo_cloud.svg +++ b/src/components/icon/assets/logo_cloud.svg @@ -1,9 +1,9 @@ - - - - - + + + + + diff --git a/src/components/icon/assets/logo_cloud_ece.svg b/src/components/icon/assets/logo_cloud_ece.svg new file mode 100644 index 00000000000..b9a6d06b044 --- /dev/null +++ b/src/components/icon/assets/logo_cloud_ece.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/components/icon/icon.js b/src/components/icon/icon.js index f5082f23c85..a005873b583 100644 --- a/src/components/icon/icon.js +++ b/src/components/icon/icon.js @@ -96,6 +96,7 @@ import loggingApp from './assets/app_logging.svg'; import logoApache from './assets/logo_apache.svg'; import logoBeats from './assets/logo_beats.svg'; import logoCloud from './assets/logo_cloud.svg'; +import logoCloudEnterprise from './assets/logo_cloud_ece.svg'; import logoDocker from './assets/logo_docker.svg'; import logoElastic from './assets/logo_elastic.svg'; import logoElasticsearch from './assets/logo_elasticsearch.svg'; @@ -265,6 +266,7 @@ const typeToIconMap = { logoApache, logoBeats, logoCloud, + logoCloudEnterprise, logoDocker, logoElastic, logoElasticsearch,