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

Slack logo updated #1954

Merged
merged 2 commits into from
May 22, 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
Expand Up @@ -3,7 +3,8 @@
- Converted `EuiStepNumber` to TS ([#1893](https://github.com/elastic/eui/pull/1893))
- Converted `EuiFormControlLayoutClearButton` to TS ([#1922](https://github.com/elastic/eui/pull/1922))
- Added `data-test-subj` property to `EuiDraggable` and `EuiDroppable` ([#1943](https://github.com/elastic/eui/pull/1943))
- Add type definitions to `EuiSuperSelect` ([##1752](https://github.com/elastic/eui/issues/1752))
- Add type definitions to `EuiSuperSelect` ([#1752](https://github.com/elastic/eui/issues/1752))
- Updated `EuiIcon` to use Slack's updated branding ([#1954](https://github.com/elastic/eui/issues/1954))

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

Expand Down
32 changes: 23 additions & 9 deletions src/components/icon/__snapshots__/icon.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4537,15 +4537,29 @@ exports[`EuiIcon props type logoSlack is rendered 1`] = `
width="32"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M13.271 14.61l4.239-1.42 1.37 4.094-4.238 1.42z"
/>
<path
d="M13.271 14.61l4.239-1.42 1.37 4.094-4.238 1.42z"
/>
<path
d="M30.629 11.556c-3.277-10.921-8-13.46-18.921-10.185-10.92 3.277-13.46 8-10.184 18.921 3.276 10.92 8 13.46 18.92 10.184 10.921-3.276 13.46-8 10.185-18.92zm-5.512 7.085l-2.057.686.711 2.133c.28.864-.177 1.803-1.04 2.083-.179.05-.382.101-.56.076a1.695 1.695 0 0 1-1.523-1.117l-.711-2.134-4.242 1.422.711 2.134c.28.863-.177 1.803-1.04 2.082-.179.051-.382.102-.56.077a1.695 1.695 0 0 1-1.523-1.118l-.712-2.133-2.057.685c-.177.051-.38.102-.558.077a1.695 1.695 0 0 1-1.524-1.118c-.28-.863.178-1.803 1.041-2.082l2.057-.686-1.371-4.089-2.057.686c-.178.05-.381.101-.56.076a1.695 1.695 0 0 1-1.523-1.118c-.28-.863.178-1.803 1.041-2.082l2.057-.686-.71-2.133c-.28-.864.177-1.803 1.04-2.083.864-.279 1.804.178 2.083 1.042l.711 2.133 4.242-1.422-.712-2.134c-.279-.863.178-1.803 1.042-2.082.863-.28 1.803.178 2.082 1.041l.711 2.133 2.057-.685c.864-.28 1.804.178 2.083 1.041.28.864-.178 1.803-1.041 2.083l-2.057.685 1.371 4.09 2.057-.687c.864-.279 1.803.178 2.083 1.042.28.863-.178 1.803-1.042 2.082z"
/>
<g
fill="none"
>
<path
d="M6.81290323 3.40645161C6.81290323 5.23870968 5.31612903 6.73548387 3.48387097 6.73548387 1.6516129 6.73548387.15483871 5.23870968.15483871 3.40645161.15483871 1.57419355 1.6516129.0774193548 3.48387097.0774193548L6.81290323.0774193548 6.81290323 3.40645161zM8.49032258 3.40645161C8.49032258 1.57419355 9.98709677.0774193548 11.8193548.0774193548 13.6516129.0774193548 15.1483871 1.57419355 15.1483871 3.40645161L15.1483871 11.7419355C15.1483871 13.5741935 13.6516129 15.0709677 11.8193548 15.0709677 9.98709677 15.0709677 8.49032258 13.5741935 8.49032258 11.7419355L8.49032258 3.40645161z"
fill="#E01E5A"
transform="translate(0 16.774)"
/>
<path
d="M11.8193548 6.81290323C9.98709677 6.81290323 8.49032258 5.31612903 8.49032258 3.48387097 8.49032258 1.6516129 9.98709677.15483871 11.8193548.15483871 13.6516129.15483871 15.1483871 1.6516129 15.1483871 3.48387097L15.1483871 6.81290323 11.8193548 6.81290323zM11.8193548 8.49032258C13.6516129 8.49032258 15.1483871 9.98709677 15.1483871 11.8193548 15.1483871 13.6516129 13.6516129 15.1483871 11.8193548 15.1483871L3.48387097 15.1483871C1.6516129 15.1483871.15483871 13.6516129.15483871 11.8193548.15483871 9.98709677 1.6516129 8.49032258 3.48387097 8.49032258L11.8193548 8.49032258z"
fill="#36C5F0"
/>
<path
d="M8.41290323 11.8193548C8.41290323 9.98709677 9.90967742 8.49032258 11.7419355 8.49032258 13.5741935 8.49032258 15.0709677 9.98709677 15.0709677 11.8193548 15.0709677 13.6516129 13.5741935 15.1483871 11.7419355 15.1483871L8.41290323 15.1483871 8.41290323 11.8193548zM6.73548387 11.8193548C6.73548387 13.6516129 5.23870968 15.1483871 3.40645161 15.1483871 1.57419355 15.1483871.0774193548 13.6516129.0774193548 11.8193548L.0774193548 3.48387097C.0774193548 1.6516129 1.57419355.15483871 3.40645161.15483871 5.23870968.15483871 6.73548387 1.6516129 6.73548387 3.48387097L6.73548387 11.8193548z"
fill="#2EB67D"
transform="translate(16.774)"
/>
<path
d="M3.40645161 8.41290323C5.23870968 8.41290323 6.73548387 9.90967742 6.73548387 11.7419355 6.73548387 13.5741935 5.23870968 15.0709677 3.40645161 15.0709677 1.57419355 15.0709677.0774193548 13.5741935.0774193548 11.7419355L.0774193548 8.41290323 3.40645161 8.41290323zM3.40645161 6.73548387C1.57419355 6.73548387.0774193548 5.23870968.0774193548 3.40645161.0774193548 1.57419355 1.57419355.0774193548 3.40645161.0774193548L11.7419355.0774193548C13.5741935.0774193548 15.0709677 1.57419355 15.0709677 3.40645161 15.0709677 5.23870968 13.5741935 6.73548387 11.7419355 6.73548387L3.40645161 6.73548387z"
fill="#ECB22E"
transform="translate(16.774 16.774)"
/>
</g>
</svg>
`;

Expand Down
30 changes: 24 additions & 6 deletions src/components/icon/assets/logo_slack.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,32 @@ import React from 'react';

const EuiIconLogoSlack = props => (
<svg
width={32}
height={32}
viewBox="0 0 32 32"
xmlns="http://www.w3.org/2000/svg"
width="32"
height="32"
viewBox="0 0 32 32"
{...props}>
<path d="M13.271 14.61l4.239-1.42 1.37 4.094-4.238 1.42z" />
<path d="M13.271 14.61l4.239-1.42 1.37 4.094-4.238 1.42z" />
<path d="M30.629 11.556c-3.277-10.921-8-13.46-18.921-10.185-10.92 3.277-13.46 8-10.184 18.921 3.276 10.92 8 13.46 18.92 10.184 10.921-3.276 13.46-8 10.185-18.92zm-5.512 7.085l-2.057.686.711 2.133c.28.864-.177 1.803-1.04 2.083-.179.05-.382.101-.56.076a1.695 1.695 0 0 1-1.523-1.117l-.711-2.134-4.242 1.422.711 2.134c.28.863-.177 1.803-1.04 2.082-.179.051-.382.102-.56.077a1.695 1.695 0 0 1-1.523-1.118l-.712-2.133-2.057.685c-.177.051-.38.102-.558.077a1.695 1.695 0 0 1-1.524-1.118c-.28-.863.178-1.803 1.041-2.082l2.057-.686-1.371-4.089-2.057.686c-.178.05-.381.101-.56.076a1.695 1.695 0 0 1-1.523-1.118c-.28-.863.178-1.803 1.041-2.082l2.057-.686-.71-2.133c-.28-.864.177-1.803 1.04-2.083.864-.279 1.804.178 2.083 1.042l.711 2.133 4.242-1.422-.712-2.134c-.279-.863.178-1.803 1.042-2.082.863-.28 1.803.178 2.082 1.041l.711 2.133 2.057-.685c.864-.28 1.804.178 2.083 1.041.28.864-.178 1.803-1.041 2.083l-2.057.685 1.371 4.09 2.057-.687c.864-.279 1.803.178 2.083 1.042.28.863-.178 1.803-1.042 2.082z" />
<g fill="none">
<path
fill="#E01E5A"
d="M6.81290323 3.40645161C6.81290323 5.23870968 5.31612903 6.73548387 3.48387097 6.73548387 1.6516129 6.73548387.15483871 5.23870968.15483871 3.40645161.15483871 1.57419355 1.6516129.0774193548 3.48387097.0774193548L6.81290323.0774193548 6.81290323 3.40645161zM8.49032258 3.40645161C8.49032258 1.57419355 9.98709677.0774193548 11.8193548.0774193548 13.6516129.0774193548 15.1483871 1.57419355 15.1483871 3.40645161L15.1483871 11.7419355C15.1483871 13.5741935 13.6516129 15.0709677 11.8193548 15.0709677 9.98709677 15.0709677 8.49032258 13.5741935 8.49032258 11.7419355L8.49032258 3.40645161z"
transform="translate(0 16.774)"
/>
<path
fill="#36C5F0"
d="M11.8193548 6.81290323C9.98709677 6.81290323 8.49032258 5.31612903 8.49032258 3.48387097 8.49032258 1.6516129 9.98709677.15483871 11.8193548.15483871 13.6516129.15483871 15.1483871 1.6516129 15.1483871 3.48387097L15.1483871 6.81290323 11.8193548 6.81290323zM11.8193548 8.49032258C13.6516129 8.49032258 15.1483871 9.98709677 15.1483871 11.8193548 15.1483871 13.6516129 13.6516129 15.1483871 11.8193548 15.1483871L3.48387097 15.1483871C1.6516129 15.1483871.15483871 13.6516129.15483871 11.8193548.15483871 9.98709677 1.6516129 8.49032258 3.48387097 8.49032258L11.8193548 8.49032258z"
/>
<path
fill="#2EB67D"
d="M8.41290323 11.8193548C8.41290323 9.98709677 9.90967742 8.49032258 11.7419355 8.49032258 13.5741935 8.49032258 15.0709677 9.98709677 15.0709677 11.8193548 15.0709677 13.6516129 13.5741935 15.1483871 11.7419355 15.1483871L8.41290323 15.1483871 8.41290323 11.8193548zM6.73548387 11.8193548C6.73548387 13.6516129 5.23870968 15.1483871 3.40645161 15.1483871 1.57419355 15.1483871.0774193548 13.6516129.0774193548 11.8193548L.0774193548 3.48387097C.0774193548 1.6516129 1.57419355.15483871 3.40645161.15483871 5.23870968.15483871 6.73548387 1.6516129 6.73548387 3.48387097L6.73548387 11.8193548z"
transform="translate(16.774)"
/>
<path
fill="#ECB22E"
d="M3.40645161 8.41290323C5.23870968 8.41290323 6.73548387 9.90967742 6.73548387 11.7419355 6.73548387 13.5741935 5.23870968 15.0709677 3.40645161 15.0709677 1.57419355 15.0709677.0774193548 13.5741935.0774193548 11.7419355L.0774193548 8.41290323 3.40645161 8.41290323zM3.40645161 6.73548387C1.57419355 6.73548387.0774193548 5.23870968.0774193548 3.40645161.0774193548 1.57419355 1.57419355.0774193548 3.40645161.0774193548L11.7419355.0774193548C13.5741935.0774193548 15.0709677 1.57419355 15.0709677 3.40645161 15.0709677 5.23870968 13.5741935 6.73548387 11.7419355 6.73548387L3.40645161 6.73548387z"
transform="translate(16.774 16.774)"
/>
</g>
</svg>
);

Expand Down
9 changes: 5 additions & 4 deletions src/components/icon/assets/logo_slack.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.