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

Code app icon #1467

Merged
merged 7 commits into from
Jan 23, 2019
Merged

Code app icon #1467

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c1d6c8f
Adding the code app icon
daveyholler Jan 23, 2019
c05ae1a
Fixing the fills on the svg to match EUI's pattern
daveyholler Jan 23, 2019
a5353bc
Updating changelog
daveyholler Jan 23, 2019
48056e6
Merge branch 'master' into code_app_icon
daveyholler Jan 23, 2019
fde619c
Update src/components/icon/assets/app_code.svg
cchaos Jan 23, 2019
3d72a47
Merge remote-tracking branch 'upstream/master' into code_app_icon
daveyholler Jan 23, 2019
a9dd42d
Merging master.
daveyholler Jan 23, 2019
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 a new app icon for Code ([#1467](https://github.com/elastic/eui/pull/1467))
No public interface changes since `6.6.0`.
- Re-added EuiI18n, EuiI18nNumber, and EuiContext for localization ([#1466](https://github.com/elastic/eui/pull/1466))

## [`6.6.0`](https://github.com/elastic/eui/tree/v6.6.0)
Expand Down
1 change: 1 addition & 0 deletions src-docs/src/views/icon/apps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const iconTypes = [
'apmApp',
'auditbeatApp',
'canvasApp',
'codeApp',
'consoleApp',
'crossClusterReplicationApp',
'dashboardApp',
Expand Down
32 changes: 32 additions & 0 deletions src/components/icon/__snapshots__/icon.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,6 +909,38 @@ exports[`EuiIcon props type clock is rendered 1`] = `
</svg>
`;

exports[`EuiIcon props type codeApp is rendered 1`] = `
<svg
class="euiIcon euiIcon--medium euiIcon--app"
focusable="false"
height="32"
viewBox="0 0 32 32"
width="32"
>
<g
fill="none"
fill-rule="nonzero"
id="icon-code-full-32"
>
<path
d="M11.276 29l.594 2H0l7.621-14.29.811 2.73L3.333 29h7.943z"
fill="#535966"
id="Combined-Shape"
/>
<path
d="M28.92 31l-4.987-16.598A16 16 0 0 0 8.688 3l1.8 6H8.4L6 1h2.607a18 18 0 0 1 17.241 12.828L31 31h-2.08z"
fill="#535966"
id="Path"
/>
<path
d="M12.037 14.02L16.492 29h6.827l-2.333-7.849a10 10 0 0 0-8.949-7.13zM9.35 12h2.05a12 12 0 0 1 11.503 8.581L26 31H15L9.35 12z"
fill="#00BDB1"
id="Rectangle"
/>
</g>
</svg>
`;

exports[`EuiIcon props type compute is rendered 1`] = `
<svg
class="euiIcon euiIcon--medium"
Expand Down
7 changes: 7 additions & 0 deletions src/components/icon/assets/app_code.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.
2 changes: 2 additions & 0 deletions src/components/icon/icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import brush from './assets/brush.svg';
import bullseye from './assets/bullseye.svg';
import calendar from './assets/calendar.svg';
import canvasApp from './assets/app_canvas.svg';
import codeApp from './assets/app_code.svg';
import check from './assets/check.svg';
import checkInCircleFilled from './assets/checkInCircleFilled.svg';
import clock from './assets/clock.svg';
Expand Down Expand Up @@ -320,6 +321,7 @@ const typeToIconMap = {
bullseye,
calendar,
canvasApp,
codeApp,
check,
checkInCircleFilled,
clock,
Expand Down