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

New spaces logo #1065

Merged
merged 3 commits into from
Aug 2, 2018
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## [`master`](https://github.com/elastic/eui/tree/master)

- Added `spacesApp` logo to `EuiIcon` set ([#1065](https://github.com/elastic/eui/pull/1065))

**Bug fixes**

- `EuiMutationObserver`'s `children` prop is no longer marked as required ([#1076](https://github.com/elastic/eui/pull/1076))
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 @@ -30,6 +30,7 @@ const iconTypes = [
'savedObjectsApp',
'searchProfilerApp',
'securityApp',
'spacesApp',
'timelionApp',
'upgradeAssistantApp',
'usersRolesApp',
Expand Down
53 changes: 53 additions & 0 deletions src/components/icon/__snapshots__/icon.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4697,6 +4697,59 @@ exports[`EuiIcon props type sortUp is rendered 1`] = `
</svg>
`;

exports[`EuiIcon props type spacesApp 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"
>
<g
fill="none"
transform="translate(2 2)"
>
<rect
fill="#00BFB3"
height="12"
rx="2"
width="12"
x="16"
/>
<rect
fill="#00A9E5"
height="12"
rx="2"
width="12"
/>
<path
d="M2 0h8a2 2 0 0 1 2 2v1H0V2a2 2 0 0 1 2-2zm16 0h8a2 2 0 0 1 2 2v1H16V2a2 2 0 0 1 2-2z"
fill="#0078A0"
/>
<rect
fill="#00BFB3"
height="12"
rx="2"
width="12"
y="16"
/>
<rect
fill="#00A9E5"
height="12"
rx="2"
width="12"
x="16"
y="16"
/>
<path
d="M2 16h8a2 2 0 0 1 2 2v1H0v-1a2 2 0 0 1 2-2zm16 0h8a2 2 0 0 1 2 2v1H16v-1a2 2 0 0 1 2-2z"
fill="#0078A0"
/>
</g>
</svg>
`;

exports[`EuiIcon props type starEmpty is rendered 1`] = `
<svg
class="euiIcon euiIcon--medium"
Expand Down
10 changes: 10 additions & 0 deletions src/components/icon/assets/app_spaces.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.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ import sortDown from './assets/sort_down.svg';
import sortLeft from './assets/sortLeft.svg';
import sortRight from './assets/sortRight.svg';
import sortUp from './assets/sort_up.svg';
import spacesApp from './assets/app_spaces.svg';
import starEmpty from './assets/star_empty.svg';
import starPlusFilled from './assets/starPlusFilled.svg';
import stats from './assets/stats.svg';
Expand Down Expand Up @@ -382,6 +383,7 @@ const typeToIconMap = {
sortLeft,
sortRight,
sortUp,
spacesApp,
starEmpty,
starPlusFilled,
stats,
Expand Down
1 change: 1 addition & 0 deletions src/components/icon/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ declare module '@elastic/eui' {
| 'sortLeft'
| 'sortRight'
| 'sortUp'
| 'spacesApp'
| 'starEmpty'
| 'starPlusFilled'
| 'stats'
Expand Down