Skip to content

Commit

Permalink
Updated logo for Security, added logos for Workplace and Observability (
Browse files Browse the repository at this point in the history
  • Loading branch information
andreadelrio committed Jan 17, 2020
1 parent 1b92b1b commit 877cb00
Show file tree
Hide file tree
Showing 14 changed files with 183 additions and 68 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
4 changes: 2 additions & 2 deletions src-docs/src/views/icon/logos.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import {
} from '../../../../src/components';

const iconTypes = [
'logoAPM',
'logoAppSearch',
'logoBeats',
'logoBusinessAnalytics',
Expand All @@ -31,15 +30,16 @@ const iconTypes = [
'logoElastic',
'logoElasticStack',
'logoElasticsearch',
'logoEnterpriseSearch',
'logoKibana',
'logoLogging',
'logoLogstash',
'logoMaps',
'logoMetrics',
'logoObservability',
'logoSecurity',
'logoSiteSearch',
'logoUptime',
'logoWorkplaceSearch',
].sort();

export default () => (
Expand Down
101 changes: 75 additions & 26 deletions src/components/icon/__snapshots__/icon.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3306,16 +3306,16 @@ exports[`EuiIcon props type logoAPM is rendered 1`] = `
>
<title />
<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>
`;
Expand Down Expand Up @@ -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>
`;

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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>
`;
Expand Down Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions src/components/icon/assets/logo_apm.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ const EuiIconLogoApm = ({ title, ...props }) => (
xmlns="http://www.w3.org/2000/svg"
{...props}>
<title>{title}</title>
<path fill="#F04E98" d="M0 0h32v10H0z" />
<path d="M10 32H7.238C3.793 32 1 28.865 1 24.998V15h9v17z" fill="#F04E98" />
<path className="euiIcon__fillNegative" d="M10 32h9V8h-9z" />
<path
className="euiIcon__fillNegative"
d="M10 10h22a10 10 0 01-10 10H10V10z"
d="M31 32h-9V0l1.973.024C27.866.072 31 3.731 31 8.228V32z"
fill="#07C"
/>
<path fill="#0080D5" d="M19 23h13v9H19z" />
</svg>
);

Expand Down
10 changes: 5 additions & 5 deletions src/components/icon/assets/logo_apm.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 12 additions & 14 deletions src/components/icon/assets/logo_enterprise_search.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,18 @@ const EuiIconLogoEnterpriseSearch = ({ title, ...props }) => (
xmlns="http://www.w3.org/2000/svg"
{...props}>
<title>{title}</title>
<g fill="none" fillRule="evenodd">
<path
fill="#00BFB3"
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"
/>
<path
fill="#FEC514"
d="M8 24h2.222A12.996 12.996 0 0013 16c0-2.935-1.012-5.744-2.778-8H8a8 8 0 000 16"
/>
<path
className="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
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"
className="euiIcon__fillNegative"
/>
</svg>
);

Expand Down
12 changes: 6 additions & 6 deletions src/components/icon/assets/logo_enterprise_search.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions src/components/icon/assets/logo_observability.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React from 'react';

const EuiIconLogoObservability = ({ title, ...props }) => (
<svg
width={32}
height={32}
viewBox="0 0 32 32"
xmlns="http://www.w3.org/2000/svg"
{...props}>
<title>{title}</title>
<path d="M10 32H7.238C3.793 32 1 28.865 1 24.998V15h9v17z" fill="#F04E98" />
<path className="euiIcon__fillNegative" d="M10 32h9V8h-9z" />
<path
d="M31 32h-9V0l1.973.024C27.866.072 31 3.731 31 8.228V32z"
fill="#07C"
/>
</svg>
);

export const icon = EuiIconLogoObservability;
7 changes: 7 additions & 0 deletions src/components/icon/assets/logo_observability.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions src/components/icon/assets/logo_security.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ const EuiIconLogoSecurity = ({ title, ...props }) => (
{...props}>
<title>{title}</title>
<path
fill="#00BFB3"
d="M0 22c0 5.522 4.478 10 10 10V12C4.478 12 0 16.477 0 22"
d="M9 7.008V0h20v16.744c0 3.913-6.378 6.477-9.015 7.256V7.008H9z"
fill="#FA744E"
/>
<path
fill="#F04E98"
d="M10 0v9c7.168 0 13 5.831 13 13h9C32 9.85 22.15 0 10 0"
d="M3 20.073V10h14v22C7.667 27.98 3 24.004 3 20.073z"
fill="#1DBAB0"
/>
<path
d="M9 10h8v14c-2.983-1.14-8-3.756-8-7.043V10z"
className="euiIcon__fillNegative"
d="M10 12v10h10c0-5.523-4.478-10-10-10"
/>
</svg>
);
Expand Down
12 changes: 7 additions & 5 deletions src/components/icon/assets/logo_security.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions src/components/icon/assets/logo_workplace_search.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import React from 'react';

const EuiIconLogoWorkplaceSearch = ({ title, ...props }) => (
<svg
width={32}
height={32}
viewBox="0 0 32 32"
xmlns="http://www.w3.org/2000/svg"
{...props}>
<title>{title}</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
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"
className="euiIcon__fillNegative"
/>
</svg>
);

export const icon = EuiIconLogoWorkplaceSearch;
7 changes: 7 additions & 0 deletions src/components/icon/assets/logo_workplace_search.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/components/icon/icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down

0 comments on commit 877cb00

Please sign in to comment.