From df16536bb072a6fce7d4fd89c4fde0413b88cba6 Mon Sep 17 00:00:00 2001 From: "dave.snider@gmail.com" Date: Mon, 8 Jan 2018 12:40:29 -0800 Subject: [PATCH] Apache, Nginx, MySQL logos (#270) Adds new third party logos to our icons --- CHANGELOG.md | 2 +- src-docs/src/views/icon/logos.js | 3 + .../icon/__snapshots__/icon.test.js.snap | 292 ++++++++++++++++++ src/components/icon/assets/logo_apache.svg | 54 ++++ src/components/icon/assets/logo_mysql.svg | 6 + src/components/icon/assets/logo_nginx.svg | 6 + src/components/icon/icon.js | 6 + 7 files changed, 368 insertions(+), 1 deletion(-) create mode 100644 src/components/icon/assets/logo_apache.svg create mode 100644 src/components/icon/assets/logo_mysql.svg create mode 100644 src/components/icon/assets/logo_nginx.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index 3781e03fcd9..46c065eb586 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # [`master`](https://github.com/elastic/eui/tree/master) -No public interface changes since `0.0.11`. +- Added Apache, Nginx, MySQL logos [(#270)](https://github.com/elastic/eui/pull/270) # [`0.0.11`](https://github.com/elastic/eui/tree/v0.0.11) diff --git a/src-docs/src/views/icon/logos.js b/src-docs/src/views/icon/logos.js index 189975bb444..1e3dfb64e81 100644 --- a/src-docs/src/views/icon/logos.js +++ b/src-docs/src/views/icon/logos.js @@ -9,6 +9,7 @@ import { } from '../../../../src/components'; const iconTypes = [ + 'logoApache', 'logoBeats', 'logoCloud', 'logoElastic', @@ -17,6 +18,8 @@ const iconTypes = [ 'logoGmail', 'logoKibana', 'logoLogstash', + 'logoMySQL', + 'logoNginx', 'logoSlack', 'logoWebhook', 'logoXpack', diff --git a/src/components/icon/__snapshots__/icon.test.js.snap b/src/components/icon/__snapshots__/icon.test.js.snap index 960065d9cb1..9e9a5a99848 100644 --- a/src/components/icon/__snapshots__/icon.test.js.snap +++ b/src/components/icon/__snapshots__/icon.test.js.snap @@ -1339,6 +1339,238 @@ exports[`EuiIcon renders type loggingApp 1`] = ` `; +exports[`EuiIcon renders type logoApache 1`] = ` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +`; + exports[`EuiIcon renders type logoBeats 1`] = ` `; +exports[`EuiIcon renders type logoMySQL 1`] = ` + + + + + + + + + +`; + +exports[`EuiIcon renders type logoNginx 1`] = ` + + + + + + +`; + exports[`EuiIcon renders type logoSlack 1`] = ` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/icon/assets/logo_mysql.svg b/src/components/icon/assets/logo_mysql.svg new file mode 100644 index 00000000000..cfe6cbb664e --- /dev/null +++ b/src/components/icon/assets/logo_mysql.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/components/icon/assets/logo_nginx.svg b/src/components/icon/assets/logo_nginx.svg new file mode 100644 index 00000000000..49ac842a8e3 --- /dev/null +++ b/src/components/icon/assets/logo_nginx.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/components/icon/icon.js b/src/components/icon/icon.js index 472b8589845..4dc4ef5d6d5 100644 --- a/src/components/icon/icon.js +++ b/src/components/icon/icon.js @@ -53,6 +53,7 @@ import list from './assets/list.svg'; import listAdd from './assets/list_add.svg'; import lock from './assets/lock.svg'; 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 logoElastic from './assets/logo_elastic.svg'; @@ -61,6 +62,8 @@ import logoElasticStack from './assets/logo_elastic_stack.svg'; import logoGmail from './assets/logo_gmail.svg'; import logoKibana from './assets/logo_kibana.svg'; import logoLogstash from './assets/logo_logstash.svg'; +import logoMySQL from './assets/logo_mysql.svg'; +import logoNginx from './assets/logo_nginx.svg'; import logoSlack from './assets/logo_slack.svg'; import logoWebhook from './assets/logo_webhook.svg'; import logoXpack from './assets/logo_xpack.svg'; @@ -158,6 +161,7 @@ const typeToIconMap = { listAdd, lock, loggingApp, + logoApache, logoBeats, logoCloud, logoElastic, @@ -166,6 +170,8 @@ const typeToIconMap = { logoGmail, logoKibana, logoLogstash, + logoMySQL, + logoNginx, logoSlack, logoWebhook, logoXpack,