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.

Sign up for GitHub

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

Jump to bottom

Adding IBM logos #1321

Merged
merged 3 commits into from
Nov 19, 2018
Merged

Adding IBM logos #1321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adc7cc9
Adding IBM logos
gjones Nov 19, 2018
5a09af8
Updating changelog.
gjones Nov 19, 2018
489a5f2
adding updated snap
gjones Nov 19, 2018
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## [`master`](https://github.com/elastic/eui/tree/master)

- Added IBM logo in colour and mono
([#1321](https://github.com/elastic/eui/pull/1321))
- Added support for nodes as "Action" column headers in `EuiBasicTable`, which was overlooked in the original change in `4.5.0` ([#1312](https://github.com/elastic/eui/pull/1312))

**Bug fixes**
Expand Down
2 changes: 2 additions & 0 deletions src-docs/src/views/icon/logos_third.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ const iconTypes = [
'logoGmail',
'logoGolang',
'logoHAproxy',
'logoIBM',
'logoIBMMono',
'logoKafka',
'logoKubernetes',
'logoMemcached',
Expand Down
171 changes: 171 additions & 0 deletions src/components/icon/__snapshots__/icon.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3259,6 +3259,177 @@ exports[`EuiIcon props type logoHAproxy is rendered 1`] = `
</svg>
`;

exports[`EuiIcon props type logoIBM 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"
>
<defs>
<linearGradient
id="logo_ibm-a"
x1="8.005%"
x2="53.33%"
y1="79.323%"
y2="79.324%"
>
<stop
offset="0%"
stop-color="#3BDADE"
stop-opacity="0"
/>
<stop
offset="30.476%"
stop-color="#36CEE1"
stop-opacity=".383"
/>
<stop
offset="100%"
stop-color="#21A2EF"
/>
</linearGradient>
<linearGradient
id="logo_ibm-b"
x1="19.496%"
x2="71.309%"
y1="83.344%"
y2="17.638%"
>
<stop
offset="0%"
stop-color="#207FFA"
/>
<stop
offset="100%"
stop-color="#6EAFF1"
stop-opacity="0"
/>
</linearGradient>
<linearGradient
id="logo_ibm-c"
x1="21.909%"
x2="21.909%"
y1="96.314%"
y2="29.454%"
>
<stop
offset="0%"
stop-color="#42C1E6"
stop-opacity="0"
/>
<stop
offset="57.076%"
stop-color="#6FB9EF"
/>
<stop
offset="86.716%"
stop-color="#60CBE7"
/>
<stop
offset="100%"
stop-color="#5CCFE5"
stop-opacity="0"
/>
</linearGradient>
<linearGradient
id="logo_ibm-d"
x1="96.205%"
x2="-1.172%"
y1="12.667%"
y2="-22.252%"
>
<stop
offset="0%"
stop-color="#6FB9EF"
stop-opacity="0"
/>
<stop
offset="22.427%"
stop-color="#38D2E0"
/>
<stop
offset="91.203%"
stop-color="#6ABFEC"
/>
<stop
offset="100%"
stop-color="#5CCFE5"
stop-opacity="0"
/>
</linearGradient>
<linearGradient
id="logo_ibm-e"
x1="9.408%"
x2="80.589%"
y1="87.764%"
y2="83.138%"
>
<stop
offset="0%"
stop-color="#126CFD"
/>
<stop
offset="100%"
stop-color="#21A1EF"
/>
</linearGradient>
</defs>
<g
fill="none"
fill-rule="evenodd"
>
<path
d="M4.262 13.122a.604.604 0 0 1-.3-.08l-2.844-1.625a.617.617 0 0 1-.295-.734.608.608 0 0 1 .868-.315l2.843 1.625c.29.159.405.514.261.81a.603.603 0 0 1-.533.32zm4.914-4.864a.603.603 0 0 1-.522-.298L7.012 5.144a.615.615 0 0 1 .115-.782.606.606 0 0 1 .91.157l1.64 2.813a.617.617 0 0 1-.158.819c-.1.07-.22.107-.343.107zm6.107-2.416V2.635a.624.624 0 0 1 .575-.634.605.605 0 0 1 .443.164.593.593 0 0 1 .186.431v3.285a.593.593 0 0 1-.186.43.605.605 0 0 1-.443.165.624.624 0 0 1-.575-.634zm7.312 2.416a.604.604 0 0 1-.343-.107.617.617 0 0 1-.159-.82l1.64-2.812a.602.602 0 0 1 .911-.157c.223.2.271.528.115.782L23.117 7.96a.603.603 0 0 1-.522.298zm4.914 4.864a.602.602 0 0 1-.534-.319.616.616 0 0 1 .262-.81l2.818-1.611a.626.626 0 0 1 .783.112.592.592 0 0 1-.156.906l-2.873 1.643a.604.604 0 0 1-.3.08z"
fill="#38D2E0"
/>
<path
d="M16.536 19.645l-1.204-.009c.026-3.377 2.146-6.391 5.337-7.585a8.308 8.308 0 0 1 9.068 2.197l-.897.795a7.097 7.097 0 0 0-7.745-1.876c-2.726 1.019-4.537 3.593-4.559 6.478z"
fill="url(#logo_ibm-a)"
transform="translate(0 2)"
/>
<path
d="M.029 20.909c.022-3.354 2.475-6.208 5.815-6.764l.201 1.176c-2.764.46-4.794 2.82-4.812 5.596L.029 20.91z"
fill="url(#logo_ibm-b)"
transform="translate(0 2)"
/>
<path
d="M8.246 24.737a10.625 10.625 0 0 1 0-15.131c4.219-4.178 11.06-4.178 15.279 0a10.89 10.89 0 0 1 1.384 1.678l-1.004.657a9.517 9.517 0 0 0-1.231-1.492c-3.75-3.713-9.828-3.713-13.577 0a9.442 9.442 0 0 0 0 13.445l-.851.843z"
fill="url(#logo_ibm-c)"
transform="translate(0 2)"
/>
<path
d="M5.836 13.234c.404-1.332 1.33-2.56 2.41-3.628 4.219-4.178 11.06-4.178 15.279 0a10.89 10.89 0 0 1 1.384 1.678l-1.004.657a9.517 9.517 0 0 0-1.231-1.492c-3.75-3.713-9.828-3.713-13.577 0a9.474 9.474 0 0 0-2.074 3.06c-1.452 3.45-2.358 3.593-1.187-.275z"
fill="url(#logo_ibm-d)"
transform="translate(0 2)"
/>
<path
d="M23.524 27.87H6.96a7.012 7.012 0 0 1-4.922-2.059A6.876 6.876 0 0 1 .029 20.91l1.204.009a5.69 5.69 0 0 0 1.66 4.055 5.802 5.802 0 0 0 4.071 1.705h16.618c2.78.002 5.302-1.616 6.438-4.13a6.929 6.929 0 0 0-1.18-7.505l.897-.795a8.112 8.112 0 0 1 1.384 8.785c-1.329 2.943-4.279 4.837-7.534 4.838h-.063z"
fill="url(#logo_ibm-e)"
transform="translate(0 2)"
/>
</g>
</svg>
`;

exports[`EuiIcon props type logoIBMMono 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="M.047 22.909l1.186.009a5.69 5.69 0 0 0 1.66 4.055 5.802 5.802 0 0 0 4.071 1.705h16.618c2.78.002 5.302-1.616 6.438-4.13a6.929 6.929 0 0 0-1.18-7.505l.897-.795a8.112 8.112 0 0 1 1.384 8.785c-1.329 2.943-4.279 4.837-7.534 4.838H6.96a7.012 7.012 0 0 1-4.922-2.06A6.876 6.876 0 0 1 .029 22.91h.018-.018c.017-2.71 1.62-5.091 3.997-6.2.114-.054.32.29.619 1.03a5.71 5.71 0 0 0-3.412 5.18l-1.186-.01zm4.215-9.787a.604.604 0 0 1-.3-.08l-2.844-1.625a.617.617 0 0 1-.295-.734.608.608 0 0 1 .868-.315l2.843 1.625c.29.159.405.514.261.81a.603.603 0 0 1-.533.32zm4.914-4.864a.603.603 0 0 1-.522-.298L7.012 5.144a.615.615 0 0 1 .115-.782.606.606 0 0 1 .91.157l1.64 2.813a.617.617 0 0 1-.158.819c-.1.07-.22.107-.343.107zm6.107-2.416V2.635a.624.624 0 0 1 .575-.634.605.605 0 0 1 .443.164.593.593 0 0 1 .186.431v3.285a.593.593 0 0 1-.186.43.605.605 0 0 1-.443.165.624.624 0 0 1-.575-.634zm7.312 2.416a.604.604 0 0 1-.343-.107.617.617 0 0 1-.159-.82l1.64-2.812a.602.602 0 0 1 .911-.157c.223.2.271.528.115.782L23.117 7.96a.603.603 0 0 1-.522.298zm4.914 4.864a.602.602 0 0 1-.534-.319.616.616 0 0 1 .262-.81l2.818-1.611a.626.626 0 0 1 .783.112.592.592 0 0 1-.156.906l-2.873 1.643a.604.604 0 0 1-.3.08zM16.366 19.78H16a2.322 2.322 0 0 1-.302 0c-.09-.011-.152.05-.086-.196a8.204 8.204 0 0 1 5.057-5.533 8.308 8.308 0 0 1 9.068 2.197l-.897.795a7.097 7.097 0 0 0-7.745-1.876 7.009 7.009 0 0 0-4.288 4.613c-.115.399-.115.399 0 0h-.44zM6.154 23.826a10.626 10.626 0 0 1 2.092-12.22c4.219-4.178 11.06-4.178 15.279 0l-.851.843c-3.75-3.713-9.828-3.713-13.577 0A9.442 9.442 0 0 0 7.264 23.36a6.99 6.99 0 0 0-.418.172l-.212.094-.162.077-.094.03-.09.039c.648-.282.965-.42.95-.412-.026.015-1.073.489-1.084.466z"
fill-rule="evenodd"
/>
</svg>
`;

exports[`EuiIcon props type logoKafka is rendered 1`] = `
<svg
class="euiIcon euiIcon--medium"
Expand Down
37 changes: 37 additions & 0 deletions src/components/icon/assets/logo_ibm.svg
View file
Open in desktop
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_ibm_mono.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/components/icon/icon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ import logoGithub from './assets/logo_github.svg';
import logoGmail from './assets/logo_gmail.svg';
import logoGolang from './assets/logo_golang.svg';
import logoHAproxy from './assets/logo_haproxy.svg';
import logoIBM from './assets/logo_ibm.svg';
import logoIBMMono from './assets/logo_ibm_mono.svg';
import logoKafka from './assets/logo_kafka.svg';
import logoKibana from './assets/logo_kibana.svg';
import logoKubernetes from './assets/logo_kubernetes.svg';
Expand Down Expand Up @@ -396,6 +398,8 @@ const typeToIconMap = {
logoGmail,
logoGolang,
logoHAproxy,
logoIBM,
logoIBMMono,
logoKafka,
logoKibana,
logoKubernetes,
Expand Down
2 changes: 2 additions & 0 deletions src/components/icon/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ declare module '@elastic/eui' {
| 'logoGmail'
| 'logoGolang'
| 'logoHAproxy'
| 'logoIBM'
| 'logoIBMMono'
| 'logoKafka'
| 'logoKibana'
| 'logoKubernetes'
Expand Down