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

a new branch icon #1249

Merged
merged 4 commits into from
Nov 2, 2018
Merged

a new branch icon #1249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2d377c
a new branch icon
daveyholler Oct 17, 2018
6d9f48e
Updating changelog to reflect changes in this PR
daveyholler Oct 18, 2018
0829877
Merge branch 'master' into branch_icon
daveyholler Oct 18, 2018
9da6440
Merge branch 'master' into branch_icon
daveyholler Nov 2, 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## [`master`](https://github.com/elastic/eui/tree/master)

- Adding a `branch` icon to `EuiIcon` ([#1249](https://github.com/elastic/eui/pull/1249/))

No public interface changes since `4.7.0`.

- Added and updated new product logos to `EuiIcon` ([#1279](https://github.com/elastic/eui/pull/1279))

**Bug fixes**
Expand Down
1 change: 1 addition & 0 deletions src-docs/src/views/icon/icons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const iconTypes = [
'bolt',
'boxesHorizontal',
'boxesVertical',
'branch',
'broom',
'brush',
'bullseye',
Expand Down
22 changes: 22 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 @@ -609,6 +609,28 @@ exports[`EuiIcon props type boxesVertical is rendered 1`] = `
</svg>
`;

exports[`EuiIcon props type branch is rendered 1`] = `
<svg
class="euiIcon euiIcon--medium"
focusable="false"
height="16"
viewBox="0 0 16 16"
width="16"
xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
>
<defs>
<path
d="M4.5 10.038A3.49 3.49 0 0 1 7 8.988h2a2.5 2.5 0 0 0 2.462-2.061 2 2 0 1 1 1.008.017A3.5 3.5 0 0 1 9 9.987H7a2.5 2.5 0 0 0-2.466 2.085 2 2 0 1 1-1.034-.009V3.937a2 2 0 1 1 1 0v6.1zM4 3a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm0 12a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm8-9a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"
id="branch"
/>
</defs>
<use
href="#branch"
/>
</svg>
`;

exports[`EuiIcon props type broom is rendered 1`] = `
<svg
class="euiIcon euiIcon--medium"
Expand Down
8 changes: 8 additions & 0 deletions src/components/icon/assets/branch.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.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import auditbeatApp from './assets/app_auditbeat.svg';
import bolt from './assets/bolt.svg';
import boxesHorizontal from './assets/boxes_horizontal.svg';
import boxesVertical from './assets/boxes_vertical.svg';
import branch from './assets/branch.svg';
import broom from './assets/broom.svg';
import brush from './assets/brush.svg';
import bullseye from './assets/bullseye.svg';
Expand Down Expand Up @@ -252,6 +253,7 @@ const typeToIconMap = {
bolt,
boxesHorizontal,
boxesVertical,
branch,
broom,
brush,
bullseye,
Expand Down
1 change: 1 addition & 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 @@ -24,6 +24,7 @@ declare module '@elastic/eui' {
| 'bolt'
| 'boxesHorizontal'
| 'boxesVertical'
| 'branch'
| 'broom'
| 'brush'
| 'bullseye'
Expand Down