From 877cb000849a491f47d2e572f79c8e1736f66eb0 Mon Sep 17 00:00:00 2001 From: Andrea Del Rio Date: Thu, 16 Jan 2020 20:57:29 -0800 Subject: [PATCH] Updated logo for Security, added logos for Workplace and Observability (#2769) --- CHANGELOG.md | 6 +- src-docs/src/views/icon/logos.js | 4 +- .../icon/__snapshots__/icon.test.tsx.snap | 101 +++++++++++++----- src/components/icon/assets/logo_apm.js | 8 +- src/components/icon/assets/logo_apm.svg | 10 +- .../icon/assets/logo_enterprise_search.js | 26 +++-- .../icon/assets/logo_enterprise_search.svg | 12 +-- .../icon/assets/logo_observability.js | 20 ++++ .../icon/assets/logo_observability.svg | 7 ++ src/components/icon/assets/logo_security.js | 10 +- src/components/icon/assets/logo_security.svg | 12 ++- .../icon/assets/logo_workplace_search.js | 26 +++++ .../icon/assets/logo_workplace_search.svg | 7 ++ src/components/icon/icon.tsx | 2 + 14 files changed, 183 insertions(+), 68 deletions(-) create mode 100644 src/components/icon/assets/logo_observability.js create mode 100644 src/components/icon/assets/logo_observability.svg create mode 100644 src/components/icon/assets/logo_workplace_search.js create mode 100644 src/components/icon/assets/logo_workplace_search.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index 84ae04d38ea..15e977f4419 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,12 @@ ## [`master`](https://github.com/elastic/eui/tree/master) - Converted `EuiFormRow` to Typescript ([#2712](https://github.com/elastic/eui/pull/2712)) +- Updated `logoAPM`, `logoSecurity` and `logoEnterpriseSearch`. Added `logoWorkplaceSearch` and `logoObservability` ([#2769](https://github.com/elastic/eui/pull/2769)) -No public interface changes since `18.2.1`. +**Deprecations** + +- `EuiIcon`'s `logoEnterpriseSearch` type deprecated in favor of `logoWorkplaceSearch` +- `EuiIcon`'s `logoAPM` type deprecated in favor of `logoObservability` ## [`18.2.1`](https://github.com/elastic/eui/tree/v18.2.1) diff --git a/src-docs/src/views/icon/logos.js b/src-docs/src/views/icon/logos.js index ec290fba145..bbf984e9445 100644 --- a/src-docs/src/views/icon/logos.js +++ b/src-docs/src/views/icon/logos.js @@ -21,7 +21,6 @@ import { } from '../../../../src/components'; const iconTypes = [ - 'logoAPM', 'logoAppSearch', 'logoBeats', 'logoBusinessAnalytics', @@ -31,15 +30,16 @@ const iconTypes = [ 'logoElastic', 'logoElasticStack', 'logoElasticsearch', - 'logoEnterpriseSearch', 'logoKibana', 'logoLogging', 'logoLogstash', 'logoMaps', 'logoMetrics', + 'logoObservability', 'logoSecurity', 'logoSiteSearch', 'logoUptime', + 'logoWorkplaceSearch', ].sort(); export default () => ( diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index 1f255ca9840..993b5cc99b2 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -3306,16 +3306,16 @@ exports[`EuiIcon props type logoAPM is rendered 1`] = ` > <path - d="M0 0h32v10H0z" + d="M10 32H7.238C3.793 32 1 28.865 1 24.998V15h9v17z" fill="#F04E98" /> <path class="euiIcon__fillNegative" - d="M10 10h22a10 10 0 01-10 10H10V10z" + d="M10 32h9V8h-9z" /> <path - d="M19 23h13v9H19z" - fill="#0080D5" + d="M31 32h-9V0l1.973.024C27.866.072 31 3.731 31 8.228V32z" + fill="#07C" /> </svg> `; @@ -4064,23 +4064,18 @@ exports[`EuiIcon props type logoEnterpriseSearch is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > <title /> - <g - fill="none" - fill-rule="evenodd" - > - <path - d="M16 0c-2.918 0-5.645.794-8 2.158 4.777 2.768 8 7.923 8 13.842 0 5.919-3.223 11.074-8 13.842A15.907 15.907 0 0016 32c8.837 0 16-7.163 16-16S24.837 0 16 0" - fill="#00BFB3" - /> - <path - d="M8 24h2.222A12.996 12.996 0 0013 16c0-2.935-1.012-5.744-2.778-8H8a8 8 0 000 16" - fill="#FEC514" - /> - <path - class="euiIcon__fillNegative" - d="M16 8h-2.152A15.877 15.877 0 0116 16c0 2.918-.786 5.647-2.152 8H16a8 8 0 000-16" - /> - </g> + <path + d="M17.557 5.05c.17-.202.457-.512.86-.93C19.483 3.017 21.828 1 23.801 1H30v30h-6.2c-1.972 0-3.995-1.449-5.383-3.106l-.764-1.052 2.75-3.477c3.462-4.376 3.463-10.332.001-14.707L17.557 5.05z" + fill="#FEC514" + /> + <path + d="M2 31V1h5.81c1.71 0 3.35.786 4.387 2.1l5.855 7.42c2.598 3.283 2.598 7.698-.002 10.983l-5.855 7.403C11.158 30.217 9.52 31 7.815 31H2z" + fill="#F04E98" + /> + <path + class="euiIcon__fillNegative" + d="M15.384 24.89L12.15 21.7c-2.868-3.318-2.868-8.22.002-11.322 1.535-1.639 2.611-2.718 3.23-3.238l2.67 3.238c2.637 3.385 2.575 7.987-.062 11.374l-2.607 3.137z" + /> </svg> `; @@ -4878,6 +4873,33 @@ exports[`EuiIcon props type logoNginx is rendered 1`] = ` </svg> `; +exports[`EuiIcon props type logoObservability is rendered 1`] = ` +<svg + aria-hidden="true" + class="euiIcon euiIcon--medium euiIcon-isLoaded" + focusable="false" + height="32" + role="img" + viewBox="0 0 32 32" + width="32" + xmlns="http://www.w3.org/2000/svg" +> + <title /> + <path + d="M10 32H7.238C3.793 32 1 28.865 1 24.998V15h9v17z" + fill="#F04E98" + /> + <path + class="euiIcon__fillNegative" + d="M10 32h9V8h-9z" + /> + <path + d="M31 32h-9V0l1.973.024C27.866.072 31 3.731 31 8.228V32z" + fill="#07C" + /> +</svg> +`; + exports[`EuiIcon props type logoOsquery is rendered 1`] = ` <svg aria-hidden="true" @@ -5214,16 +5236,16 @@ exports[`EuiIcon props type logoSecurity is rendered 1`] = ` > <title /> <path - d="M0 22c0 5.522 4.478 10 10 10V12C4.478 12 0 16.477 0 22" - fill="#00BFB3" + d="M9 7.008V0h20v16.744c0 3.913-6.378 6.477-9.015 7.256V7.008H9z" + fill="#FA744E" /> <path - d="M10 0v9c7.168 0 13 5.831 13 13h9C32 9.85 22.15 0 10 0" - fill="#F04E98" + d="M3 20.073V10h14v22C7.667 27.98 3 24.004 3 20.073z" + fill="#1DBAB0" /> <path class="euiIcon__fillNegative" - d="M10 12v10h10c0-5.523-4.478-10-10-10" + d="M9 10h8v14c-2.983-1.14-8-3.756-8-7.043V10z" /> </svg> `; @@ -5415,6 +5437,33 @@ exports[`EuiIcon props type logoWindows is rendered 1`] = ` </svg> `; +exports[`EuiIcon props type logoWorkplaceSearch is rendered 1`] = ` +<svg + aria-hidden="true" + class="euiIcon euiIcon--medium euiIcon-isLoaded" + focusable="false" + height="32" + role="img" + viewBox="0 0 32 32" + width="32" + xmlns="http://www.w3.org/2000/svg" +> + <title /> + <path + d="M17.557 5.05c.17-.202.457-.512.86-.93C19.483 3.017 21.828 1 23.801 1H30v30h-6.2c-1.972 0-3.995-1.449-5.383-3.106l-.764-1.052 2.75-3.477c3.462-4.376 3.463-10.332.001-14.707L17.557 5.05z" + fill="#FEC514" + /> + <path + d="M2 31V1h5.81c1.71 0 3.35.786 4.387 2.1l5.855 7.42c2.598 3.283 2.598 7.698-.002 10.983l-5.855 7.403C11.158 30.217 9.52 31 7.815 31H2z" + fill="#F04E98" + /> + <path + class="euiIcon__fillNegative" + d="M15.384 24.89L12.15 21.7c-2.868-3.318-2.868-8.22.002-11.322 1.535-1.639 2.611-2.718 3.23-3.238l2.67 3.238c2.637 3.385 2.575 7.987-.062 11.374l-2.607 3.137z" + /> +</svg> +`; + exports[`EuiIcon props type logsApp is rendered 1`] = ` <svg aria-hidden="true" diff --git a/src/components/icon/assets/logo_apm.js b/src/components/icon/assets/logo_apm.js index c10d937d5c1..ef7d91b7172 100644 --- a/src/components/icon/assets/logo_apm.js +++ b/src/components/icon/assets/logo_apm.js @@ -8,12 +8,12 @@ const EuiIconLogoApm = ({ title, ...props }) => ( xmlns="http://www.w3.org/2000/svg" {...props}> <title>{title} - + + - ); diff --git a/src/components/icon/assets/logo_apm.svg b/src/components/icon/assets/logo_apm.svg index fbeb57b1d49..6477ae54c01 100644 --- a/src/components/icon/assets/logo_apm.svg +++ b/src/components/icon/assets/logo_apm.svg @@ -1,7 +1,7 @@ - + - - - + + + - + \ No newline at end of file diff --git a/src/components/icon/assets/logo_enterprise_search.js b/src/components/icon/assets/logo_enterprise_search.js index 8f0a18f9488..62bffe9380c 100644 --- a/src/components/icon/assets/logo_enterprise_search.js +++ b/src/components/icon/assets/logo_enterprise_search.js @@ -8,20 +8,18 @@ const EuiIconLogoEnterpriseSearch = ({ title, ...props }) => ( xmlns="http://www.w3.org/2000/svg" {...props}> {title} - - - - - + + + ); diff --git a/src/components/icon/assets/logo_enterprise_search.svg b/src/components/icon/assets/logo_enterprise_search.svg index 54ebaee9c72..c6d221fd1ae 100644 --- a/src/components/icon/assets/logo_enterprise_search.svg +++ b/src/components/icon/assets/logo_enterprise_search.svg @@ -1,7 +1,7 @@ - - - - - - + + + + + + diff --git a/src/components/icon/assets/logo_observability.js b/src/components/icon/assets/logo_observability.js new file mode 100644 index 00000000000..dffe298c8cf --- /dev/null +++ b/src/components/icon/assets/logo_observability.js @@ -0,0 +1,20 @@ +import React from 'react'; + +const EuiIconLogoObservability = ({ title, ...props }) => ( + + {title} + + + + +); + +export const icon = EuiIconLogoObservability; diff --git a/src/components/icon/assets/logo_observability.svg b/src/components/icon/assets/logo_observability.svg new file mode 100644 index 00000000000..6477ae54c01 --- /dev/null +++ b/src/components/icon/assets/logo_observability.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/components/icon/assets/logo_security.js b/src/components/icon/assets/logo_security.js index 7d4bb569d9d..f8b1ebe3470 100644 --- a/src/components/icon/assets/logo_security.js +++ b/src/components/icon/assets/logo_security.js @@ -9,16 +9,16 @@ const EuiIconLogoSecurity = ({ title, ...props }) => ( {...props}> {title} ); diff --git a/src/components/icon/assets/logo_security.svg b/src/components/icon/assets/logo_security.svg index d9d227569b4..20e8de9a284 100644 --- a/src/components/icon/assets/logo_security.svg +++ b/src/components/icon/assets/logo_security.svg @@ -1,5 +1,7 @@ - - - - - + + + + + + + \ No newline at end of file diff --git a/src/components/icon/assets/logo_workplace_search.js b/src/components/icon/assets/logo_workplace_search.js new file mode 100644 index 00000000000..9a4593cea08 --- /dev/null +++ b/src/components/icon/assets/logo_workplace_search.js @@ -0,0 +1,26 @@ +import React from 'react'; + +const EuiIconLogoWorkplaceSearch = ({ title, ...props }) => ( + + {title} + + + + +); + +export const icon = EuiIconLogoWorkplaceSearch; diff --git a/src/components/icon/assets/logo_workplace_search.svg b/src/components/icon/assets/logo_workplace_search.svg new file mode 100644 index 00000000000..c2ef911b734 --- /dev/null +++ b/src/components/icon/assets/logo_workplace_search.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index 86f95ce5a85..ef26c9fab5d 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -208,6 +208,7 @@ const typeToPathMap = { logoMongodb: 'logo_mongodb', logoMySQL: 'logo_mysql', logoNginx: 'logo_nginx', + logoObservability: 'logo_observability', logoOsquery: 'logo_osquery', logoPhp: 'logo_php', logoPostgres: 'logo_postgres', @@ -221,6 +222,7 @@ const typeToPathMap = { logoUptime: 'logo_uptime', logoWebhook: 'logo_webhook', logoWindows: 'logo_windows', + logoWorkplaceSearch: 'logo_workplace_search', logstashFilter: 'logstash_filter', logstashIf: 'logstash_if', logstashInput: 'logstash_input',