From 9ddb82ddc7fee693ed9aee2cea9e5d8ced3e1426 Mon Sep 17 00:00:00 2001 From: "dave.snider@gmail.com" Date: Mon, 8 Jan 2018 13:29:30 -0800 Subject: [PATCH 1/2] Revert "Add missing changelog entry (#271)" This reverts commit d601b73100a9308d1fac6eb5450ce147c8ecd900. From ff92fb5f7fce2f48c5e9dde83e52350fd7de0d81 Mon Sep 17 00:00:00 2001 From: "dave.snider@gmail.com" Date: Mon, 8 Jan 2018 13:29:30 -0800 Subject: [PATCH 2/2] Revert "Apache, Nginx, MySQL logos (#270)" This reverts commit df16536bb072a6fce7d4fd89c4fde0413b88cba6. --- 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, 1 insertion(+), 368 deletions(-) delete mode 100644 src/components/icon/assets/logo_apache.svg delete mode 100644 src/components/icon/assets/logo_mysql.svg delete mode 100644 src/components/icon/assets/logo_nginx.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index 46c065eb586..3781e03fcd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # [`master`](https://github.com/elastic/eui/tree/master) -- Added Apache, Nginx, MySQL logos [(#270)](https://github.com/elastic/eui/pull/270) +No public interface changes since `0.0.11`. # [`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 1e3dfb64e81..189975bb444 100644 --- a/src-docs/src/views/icon/logos.js +++ b/src-docs/src/views/icon/logos.js @@ -9,7 +9,6 @@ import { } from '../../../../src/components'; const iconTypes = [ - 'logoApache', 'logoBeats', 'logoCloud', 'logoElastic', @@ -18,8 +17,6 @@ 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 9e9a5a99848..960065d9cb1 100644 --- a/src/components/icon/__snapshots__/icon.test.js.snap +++ b/src/components/icon/__snapshots__/icon.test.js.snap @@ -1339,238 +1339,6 @@ 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 deleted file mode 100644 index cfe6cbb664e..00000000000 --- a/src/components/icon/assets/logo_mysql.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/components/icon/assets/logo_nginx.svg b/src/components/icon/assets/logo_nginx.svg deleted file mode 100644 index 49ac842a8e3..00000000000 --- a/src/components/icon/assets/logo_nginx.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/components/icon/icon.js b/src/components/icon/icon.js index 4dc4ef5d6d5..472b8589845 100644 --- a/src/components/icon/icon.js +++ b/src/components/icon/icon.js @@ -53,7 +53,6 @@ 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'; @@ -62,8 +61,6 @@ 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'; @@ -161,7 +158,6 @@ const typeToIconMap = { listAdd, lock, loggingApp, - logoApache, logoBeats, logoCloud, logoElastic, @@ -170,8 +166,6 @@ const typeToIconMap = { logoGmail, logoKibana, logoLogstash, - logoMySQL, - logoNginx, logoSlack, logoWebhook, logoXpack,