Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Third party icons #1040

Merged
merged 7 commits into from
Jul 25, 2018
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## [`master`](https://github.com/elastic/eui/tree/master)

- Added types for `EuiToast`, `EuiGlobalToastList`, and `EuiGlobalToastListItem` ([#1045](https://github.com/elastic/eui/pull/1045))
- Added a handful of third-party logos to `EuiIcon` ([#1033](https://github.com/elastic/eui/pull/1033))

**Bug fixes**

Expand Down
1 change: 1 addition & 0 deletions src-docs/src/views/icon/apps.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const iconTypes = [
'emsApp',
'graphApp',
'grokApp',
'indexManagementApp',
'indexPatternApp',
'loggingApp',
'machineLearningApp',
Expand Down
21 changes: 20 additions & 1 deletion src-docs/src/views/icon/icon_example.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ import Logos from './logos';
const logosSource = require('!!raw-loader!./logos');
const logosHtml = renderToHtml(Logos);

import LogosThird from './logos_third';
const logosThirdSource = require('!!raw-loader!./logos_third');
const logosThirdHtml = renderToHtml(LogosThird);

import IconSizes from './icon_sizes';
const iconSizesSource = require('!!raw-loader!./icon_sizes');
const iconSizesHtml = renderToHtml(IconSizes);
Expand Down Expand Up @@ -106,7 +110,7 @@ export const IconExample = {
),
demo: <Ml />,
}, {
title: 'Logos',
title: 'Elastic logos',
source: [{
type: GuideSectionTypes.JS,
code: logosSource,
Expand All @@ -120,6 +124,21 @@ export const IconExample = {
</p>
),
demo: <Logos />,
}, {
title: 'Third party logos',
source: [{
type: GuideSectionTypes.JS,
code: logosThirdSource,
}, {
type: GuideSectionTypes.HTML,
code: logosThirdHtml,
}],
text: (
<p>
Product logos follow similar rules as app logos.
</p>
),
demo: <LogosThird />,
}, {
title: 'Sizes',
source: [{
Expand Down
11 changes: 0 additions & 11 deletions src-docs/src/views/icon/logos.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,14 @@ import {
} from '../../../../src/components';

const iconTypes = [
'logoApache',
'logoBeats',
'logoCloud',
'logoCloudEnterprise',
'logoDocker',
'logoElastic',
'logoElasticsearch',
'logoElasticStack',
'logoGithub',
'logoGmail',
'logoKibana',
'logoKubernetes',
'logoLogstash',
'logoMySQL',
'logoNginx',
'logoRedis',
'logoSketch',
'logoSlack',
'logoWebhook',
'logoXpack',
].sort();

Expand Down
63 changes: 63 additions & 0 deletions src-docs/src/views/icon/logos_third.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import React from 'react';

import {
EuiFlexGrid,
EuiFlexItem,
EuiIcon,
EuiPanel,
EuiText,
} from '../../../../src/components';

const iconTypes = [
'logoAerospike',
'logoApache',
'logoCeph',
'logoCouchbase',
'logoDocker',
'logoDropwizard',
'logoEtcd',
'logoGithub',
'logoGmail',
'logoGolang',
'logoHAproxy',
'logoKafka',
'logoKubernetes',
'logoMemcached',
'logoMongodb',
'logoMySQL',
'logoNginx',
'logoOsquery',
'logoPhp',
'logoPostgres',
'logoPrometheus',
'logoRabbitmq',
'logoRedis',
'logoSketch',
'logoSlack',
'logoWebhook',
'logoWindows',
].sort();

export default () => (
<EuiFlexGrid columns={4}>
{
iconTypes.map(iconType => (
<EuiFlexItem
className="guideDemo__icon"
key={iconType}
style={{ width: '200px' }}
>
<EuiPanel>
<EuiIcon
type={iconType}
size="xl"
/>
<EuiText size="s">
<p>{iconType}</p>
</EuiText>
</EuiPanel>
</EuiFlexItem>
))
}
</EuiFlexGrid>
);
646 changes: 633 additions & 13 deletions src/components/icon/__snapshots__/icon.test.js.snap

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions src/components/icon/assets/app_index_management.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/components/icon/assets/logo_aerospike.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/components/icon/assets/logo_ceph.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/components/icon/assets/logo_couchbase.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/components/icon/assets/logo_dropwizard.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/components/icon/assets/logo_etcd.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/components/icon/assets/logo_golang.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/components/icon/assets/logo_haproxy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/components/icon/assets/logo_kafka.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading