diff --git a/CHANGELOG.md b/CHANGELOG.md index ecd11fd0531..24166220653 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## [`master`](https://github.com/elastic/eui/tree/master) +- Added `logoSecurity`, `logoCode`, `logoMaps`, `logoUptime` and `logoLogging` to `EuiIcon` types ([#2111](https://github.com/elastic/eui/pull/2111)) - Added a `column` direction option to `EuiFlexGrid` ([#2073](https://github.com/elastic/eui/pull/2073)) - Updated `EuiSuperDatePicker`'s commonly used date/times to display as columns. ([#2073](https://github.com/elastic/eui/pull/2073)) - Added TypeScript definition for `EuiFormControlLayout` ([#2086](https://github.com/elastic/eui/pull/2086)) @@ -15,6 +16,10 @@ - Fixed `EuiPopover` from catching and preventing propagation of keydown events when closed ([#2089](https://github.com/elastic/eui/pull/2089)) - Fixed padding sizes between `EuiModal` header, body, and footer ([#2088](https://github.com/elastic/eui/pull/2088)) +**Deprecations** + +- Removed `logoXpack`from `EuiIcon` types ([#2111](https://github.com/elastic/eui/pull/2111)) + ## [`12.2.0`](https://github.com/elastic/eui/tree/v12.2.0) - Made `aria-label` attribute equal to `title` of the the selection checkbox in table items (for each row) in `EuiBasicTable` ([#2043](https://github.com/elastic/eui/pull/2043)) diff --git a/src-docs/src/views/icon/logos.js b/src-docs/src/views/icon/logos.js index 1bbf9e20c80..ec290fba145 100644 --- a/src-docs/src/views/icon/logos.js +++ b/src-docs/src/views/icon/logos.js @@ -25,6 +25,7 @@ const iconTypes = [ 'logoAppSearch', 'logoBeats', 'logoBusinessAnalytics', + 'logoCode', 'logoCloud', 'logoCloudEnterprise', 'logoElastic', @@ -32,10 +33,13 @@ const iconTypes = [ 'logoElasticsearch', 'logoEnterpriseSearch', 'logoKibana', + 'logoLogging', 'logoLogstash', + 'logoMaps', 'logoMetrics', + 'logoSecurity', 'logoSiteSearch', - 'logoXpack', + 'logoUptime', ].sort(); export default () => ( diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index 919bf81dbde..9dd9c382226 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -3447,6 +3447,30 @@ exports[`EuiIcon props type logoCloudEnterprise is rendered 1`] = ` `; +exports[`EuiIcon props type logoCode is rendered 1`] = ` + + + + + +`; + exports[`EuiIcon props type logoCodesandbox is rendered 1`] = ` `; +exports[`EuiIcon props type logoLogging is rendered 1`] = ` + + + + + +`; + exports[`EuiIcon props type logoLogstash is rendered 1`] = ` `; +exports[`EuiIcon props type logoMaps is rendered 1`] = ` + + + + + +`; + exports[`EuiIcon props type logoMemcached is rendered 1`] = ` `; +exports[`EuiIcon props type logoSecurity is rendered 1`] = ` + + + + + +`; + exports[`EuiIcon props type logoSiteSearch is rendered 1`] = ` `; +exports[`EuiIcon props type logoUptime is rendered 1`] = ` + + + + + +`; + exports[`EuiIcon props type logoWebhook is rendered 1`] = ` `; -exports[`EuiIcon props type logoXpack is rendered 1`] = ` - - - - - - - - - - -`; - exports[`EuiIcon props type logstashFilter is rendered 1`] = ` `; diff --git a/src/components/icon/assets/app_security.js b/src/components/icon/assets/app_security.js index 759701621fb..91752de98ed 100644 --- a/src/components/icon/assets/app_security.js +++ b/src/components/icon/assets/app_security.js @@ -7,10 +7,10 @@ const EuiIconAppSecurity = props => ( viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" {...props}> - + ); diff --git a/src/components/icon/assets/app_security.svg b/src/components/icon/assets/app_security.svg index a27ed12ddcb..764652288fb 100644 --- a/src/components/icon/assets/app_security.svg +++ b/src/components/icon/assets/app_security.svg @@ -1,9 +1,7 @@ - - - - - - - + + + + + diff --git a/src/components/icon/assets/logo_code.js b/src/components/icon/assets/logo_code.js new file mode 100644 index 00000000000..cc9d6a1917c --- /dev/null +++ b/src/components/icon/assets/logo_code.js @@ -0,0 +1,22 @@ +import React from 'react'; + +const EuiIconLogoCode = props => ( + + + + + +); + +export const icon = EuiIconLogoCode; diff --git a/src/components/icon/assets/logo_code.svg b/src/components/icon/assets/logo_code.svg new file mode 100644 index 00000000000..3bfde0300d9 --- /dev/null +++ b/src/components/icon/assets/logo_code.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/components/icon/assets/logo_logging.js b/src/components/icon/assets/logo_logging.js new file mode 100644 index 00000000000..d6b83745f69 --- /dev/null +++ b/src/components/icon/assets/logo_logging.js @@ -0,0 +1,22 @@ +import React from 'react'; + +const EuiIconLogoLogging = props => ( + + + + + +); + +export const icon = EuiIconLogoLogging; diff --git a/src/components/icon/assets/logo_logging.svg b/src/components/icon/assets/logo_logging.svg new file mode 100644 index 00000000000..c1b242ad609 --- /dev/null +++ b/src/components/icon/assets/logo_logging.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/components/icon/assets/logo_maps.js b/src/components/icon/assets/logo_maps.js new file mode 100644 index 00000000000..73c46e49ffc --- /dev/null +++ b/src/components/icon/assets/logo_maps.js @@ -0,0 +1,25 @@ +import React from 'react'; + +const EuiIconLogoMaps = props => ( + + + + + +); + +export const icon = EuiIconLogoMaps; diff --git a/src/components/icon/assets/logo_maps.svg b/src/components/icon/assets/logo_maps.svg new file mode 100644 index 00000000000..7ec3b6b67d6 --- /dev/null +++ b/src/components/icon/assets/logo_maps.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/components/icon/assets/logo_security.js b/src/components/icon/assets/logo_security.js new file mode 100644 index 00000000000..568528718a1 --- /dev/null +++ b/src/components/icon/assets/logo_security.js @@ -0,0 +1,22 @@ +import React from 'react'; + +const EuiIconLogoSecurity = props => ( + + + + + +); + +export const icon = EuiIconLogoSecurity; diff --git a/src/components/icon/assets/logo_security.svg b/src/components/icon/assets/logo_security.svg new file mode 100644 index 00000000000..6cf80189a14 --- /dev/null +++ b/src/components/icon/assets/logo_security.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/components/icon/assets/logo_uptime.js b/src/components/icon/assets/logo_uptime.js new file mode 100644 index 00000000000..48b66fa01d0 --- /dev/null +++ b/src/components/icon/assets/logo_uptime.js @@ -0,0 +1,25 @@ +import React from 'react'; + +const EuiIconLogoUptime = props => ( + + + + + +); + +export const icon = EuiIconLogoUptime; diff --git a/src/components/icon/assets/logo_uptime.svg b/src/components/icon/assets/logo_uptime.svg new file mode 100644 index 00000000000..40020e30f69 --- /dev/null +++ b/src/components/icon/assets/logo_uptime.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/components/icon/assets/logo_xpack.js b/src/components/icon/assets/logo_xpack.js deleted file mode 100644 index d2f40118f89..00000000000 --- a/src/components/icon/assets/logo_xpack.js +++ /dev/null @@ -1,39 +0,0 @@ -import React from 'react'; - -const EuiIconLogoXpack = props => ( - - - - - - - - - - -); - -export const icon = EuiIconLogoXpack; diff --git a/src/components/icon/assets/logo_xpack.svg b/src/components/icon/assets/logo_xpack.svg deleted file mode 100644 index 8ecfb64575d..00000000000 --- a/src/components/icon/assets/logo_xpack.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index 0848b9cd049..4094d9ac64a 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -165,6 +165,7 @@ const typeToPathMap = { logoCeph: 'logo_ceph', logoCloud: 'logo_cloud', logoCloudEnterprise: 'logo_cloud_ece', + logoCode: 'logo_code', logoCodesandbox: 'logo_codesandbox', logoCouchbase: 'logo_couchbase', logoDocker: 'logo_docker', @@ -185,7 +186,9 @@ const typeToPathMap = { logoKafka: 'logo_kafka', logoKibana: 'logo_kibana', logoKubernetes: 'logo_kubernetes', + logoLogging: 'logo_logging', logoLogstash: 'logo_logstash', + logoMaps: 'logo_maps', logoMemcached: 'logo_memcached', logoMetrics: 'logo_metrics', logoMongodb: 'logo_mongodb', @@ -197,12 +200,13 @@ const typeToPathMap = { logoPrometheus: 'logo_prometheus', logoRabbitmq: 'logo_rabbitmq', logoRedis: 'logo_redis', + logoSecurity: 'logo_security', logoSiteSearch: 'logo_site_search', logoSketch: 'logo_sketch', logoSlack: 'logo_slack', + logoUptime: 'logo_uptime', logoWebhook: 'logo_webhook', logoWindows: 'logo_windows', - logoXpack: 'logo_xpack', logstashFilter: 'logstash_filter', logstashIf: 'logstash_if', logstashInput: 'logstash_input',