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

Codesandbox link, icon and update to APM icon #1407

Merged
merged 4 commits into from
Jan 4, 2019
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## [`master`](https://github.com/elastic/eui/tree/master)

- Change `EuiListGroup` PropType for `extraAction` to clearn warning ([#1405](hhttps://github.com/elastic/eui/pull/1405))
- Added `logoCodesandbox` and updated `apmApp` icons ([#1407](https://github.com/elastic/eui/pull/1407))
- Changed `EuiListGroup` PropType for `extraAction` to remove console warning ([#1405](hhttps://github.com/elastic/eui/pull/1405))

## [`6.1.0`](https://github.com/elastic/eui/tree/v6.1.0)

Expand Down
12 changes: 12 additions & 0 deletions src-docs/src/views/home/home_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,18 @@ export const HomeView = () => (
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
<EuiFlexItem grow={false}>
<EuiLink href="https://codesandbox.io/s/ll7lnlpm97">
<strong>Codesandbox</strong>
</EuiLink>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiIcon type="logoCodesandbox" />
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>

</EuiFlexGroup>
<EuiSpacer />
Expand Down
1 change: 1 addition & 0 deletions src-docs/src/views/icon/logos_third.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const iconTypes = [
'logoAWS',
'logoAWSMono',
'logoCeph',
'logoCodesandbox',
'logoCouchbase',
'logoDocker',
'logoDropwizard',
Expand Down
6 changes: 3 additions & 3 deletions src/components/card/__snapshots__/card.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ exports[`EuiCard icon 1`] = `
>
<path
class="euiIcon__fillSecondary"
d="M0 3h24v2H0z"
d="M7 9v2H0V0h23v7h-2V2H2v7z"
/>
<path
d="M4 11h24v2H4zM4 19h15v2H4z"
d="M32 9v12H20c-6.075 0-11-4.925-11-11V9h23zm-20.945 2c.497 4.5 4.312 8 8.945 8h10v-8H11.055z"
/>
<path
class="euiIcon__fillSecondary"
d="M19 27h13v2H19z"
d="M30 23h2v9H19v-9h2v7h9z"
/>
</svg>
</span>
Expand Down
21 changes: 18 additions & 3 deletions src/components/icon/__snapshots__/icon.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -484,14 +484,14 @@ exports[`EuiIcon props type apmApp is rendered 1`] = `
>
<path
class="euiIcon__fillSecondary"
d="M0 3h24v2H0z"
d="M7 9v2H0V0h23v7h-2V2H2v7z"
/>
<path
d="M4 11h24v2H4zM4 19h15v2H4z"
d="M32 9v12H20c-6.075 0-11-4.925-11-11V9h23zm-20.945 2c.497 4.5 4.312 8 8.945 8h10v-8H11.055z"
/>
<path
class="euiIcon__fillSecondary"
d="M19 27h13v2H19z"
d="M30 23h2v9H19v-9h2v7h9z"
/>
</svg>
`;
Expand Down Expand Up @@ -3047,6 +3047,21 @@ exports[`EuiIcon props type logoCloudEnterprise is rendered 1`] = `
</svg>
`;

exports[`EuiIcon props type logoCodesandbox is rendered 1`] = `
<svg
class="euiIcon euiIcon--medium"
focusable="false"
height="32"
viewBox="0 0 32 32"
width="32"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M14.738 28.044V16.681L3.172 10.919v6.46l5.32 2.67v4.889l6.246 3.106zm2.344.066l6.357-3.17v-5.002l5.353-2.686V10.87l-11.71 5.854V28.11zM27.306 8.993l-6.003-3.012-5.286 2.656-5.325-2.659L4.637 9.03l11.317 5.638 11.352-5.675zM.828 23.744V8.324L15.981.689l15.155 7.604V23.72L15.98 31.28.828 23.743z"
/>
</svg>
`;

exports[`EuiIcon props type logoCouchbase is rendered 1`] = `
<svg
class="euiIcon euiIcon--medium"
Expand Down
9 changes: 4 additions & 5 deletions src/components/icon/assets/app_apm.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_codesandbox.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 @@ -130,6 +130,7 @@ import logoBusinessAnalytics from './assets/logo_business_analytics.svg';
import logoCeph from './assets/logo_ceph.svg';
import logoCloud from './assets/logo_cloud.svg';
import logoCloudEnterprise from './assets/logo_cloud_ece.svg';
import logoCodesandbox from './assets/logo_codesandbox.svg';
import logoCouchbase from './assets/logo_couchbase.svg';
import logoDocker from './assets/logo_docker.svg';
import logoDropwizard from './assets/logo_dropwizard.svg';
Expand Down Expand Up @@ -418,6 +419,7 @@ const typeToIconMap = {
logoCeph,
logoCloud,
logoCloudEnterprise,
logoCodesandbox,
logoCouchbase,
logoDocker,
logoDropwizard,
Expand Down