From adc7cc992ba554b386e2380873ac189b304b5d4a Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Mon, 19 Nov 2018 11:11:43 -0500 Subject: [PATCH 1/3] Adding IBM logos --- src-docs/src/views/icon/logos_third.js | 2 ++ src/components/icon/assets/logo_ibm.svg | 37 ++++++++++++++++++++ src/components/icon/assets/logo_ibm_mono.svg | 3 ++ src/components/icon/icon.js | 4 +++ src/components/icon/index.d.ts | 2 ++ 5 files changed, 48 insertions(+) create mode 100644 src/components/icon/assets/logo_ibm.svg create mode 100644 src/components/icon/assets/logo_ibm_mono.svg diff --git a/src-docs/src/views/icon/logos_third.js b/src-docs/src/views/icon/logos_third.js index d6a2ea7dcce..358eee37e39 100644 --- a/src-docs/src/views/icon/logos_third.js +++ b/src-docs/src/views/icon/logos_third.js @@ -24,6 +24,8 @@ const iconTypes = [ 'logoGmail', 'logoGolang', 'logoHAproxy', + 'logoIBM', + 'logoIBMMono', 'logoKafka', 'logoKubernetes', 'logoMemcached', diff --git a/src/components/icon/assets/logo_ibm.svg b/src/components/icon/assets/logo_ibm.svg new file mode 100644 index 00000000000..cd92afbd72f --- /dev/null +++ b/src/components/icon/assets/logo_ibm.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/icon/assets/logo_ibm_mono.svg b/src/components/icon/assets/logo_ibm_mono.svg new file mode 100644 index 00000000000..dab482b5fdc --- /dev/null +++ b/src/components/icon/assets/logo_ibm_mono.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/icon.js b/src/components/icon/icon.js index 13cd01addf1..b07938ac58c 100644 --- a/src/components/icon/icon.js +++ b/src/components/icon/icon.js @@ -135,6 +135,8 @@ import logoGithub from './assets/logo_github.svg'; import logoGmail from './assets/logo_gmail.svg'; import logoGolang from './assets/logo_golang.svg'; import logoHAproxy from './assets/logo_haproxy.svg'; +import logoIBM from './assets/logo_ibm.svg'; +import logoIBMMono from './assets/logo_ibm_mono.svg'; import logoKafka from './assets/logo_kafka.svg'; import logoKibana from './assets/logo_kibana.svg'; import logoKubernetes from './assets/logo_kubernetes.svg'; @@ -396,6 +398,8 @@ const typeToIconMap = { logoGmail, logoGolang, logoHAproxy, + logoIBM, + logoIBMMono, logoKafka, logoKibana, logoKubernetes, diff --git a/src/components/icon/index.d.ts b/src/components/icon/index.d.ts index 3639ea66cb1..af7c6c0ac40 100644 --- a/src/components/icon/index.d.ts +++ b/src/components/icon/index.d.ts @@ -134,6 +134,8 @@ declare module '@elastic/eui' { | 'logoGmail' | 'logoGolang' | 'logoHAproxy' + | 'logoIBM' + | 'logoIBMMono' | 'logoKafka' | 'logoKibana' | 'logoKubernetes' From 5a09af8d0c048f9177eec3b78b9950f2c674f9c8 Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Mon, 19 Nov 2018 11:19:50 -0500 Subject: [PATCH 2/3] Updating changelog. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3c6b4fe414..e6155af4b37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## [`master`](https://github.com/elastic/eui/tree/master) +- Added IBM logo in colour and mono +([#1321](https://github.com/elastic/eui/pull/1321)) - Added support for nodes as "Action" column headers in `EuiBasicTable`, which was overlooked in the original change in `4.5.0` ([#1312](https://github.com/elastic/eui/pull/1312)) **Bug fixes** From 489a5f2052c196bd1c0fca4b965f67215b07fcb3 Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Mon, 19 Nov 2018 11:20:44 -0500 Subject: [PATCH 3/3] adding updated snap --- .../icon/__snapshots__/icon.test.js.snap | 171 ++++++++++++++++++ 1 file changed, 171 insertions(+) diff --git a/src/components/icon/__snapshots__/icon.test.js.snap b/src/components/icon/__snapshots__/icon.test.js.snap index 72e7c79d9f3..8809540c218 100644 --- a/src/components/icon/__snapshots__/icon.test.js.snap +++ b/src/components/icon/__snapshots__/icon.test.js.snap @@ -3259,6 +3259,177 @@ exports[`EuiIcon props type logoHAproxy is rendered 1`] = ` `; +exports[`EuiIcon props type logoIBM is rendered 1`] = ` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +`; + +exports[`EuiIcon props type logoIBMMono is rendered 1`] = ` + + + +`; + exports[`EuiIcon props type logoKafka is rendered 1`] = `