Skip to content

Commit

Permalink
add zoom in and out icons
Browse files Browse the repository at this point in the history
  • Loading branch information
ryankeairns committed Jun 18, 2019
1 parent 8afcf46 commit d001aea
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## [`master`](https://github.com/elastic/eui/tree/master)

- Changed `EuiNavDrawerFlyout` title from `h5` to `div` ([#2040](https://github.com/elastic/eui/pull/2040))
- Added `magnifyWithMinus` and `magnifyWithPlus` glyphs to `EuiIcon` ([2056](https://github.com/elastic/eui/pull/2056))

**Bug fixes**

Expand Down
2 changes: 2 additions & 0 deletions src-docs/src/views/icon/icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ const iconTypes = [
'logstashInput',
'logstashOutput',
'logstashQueue',
'magnifyWithMinus',
'magnifyWithPlus',
'magnet',
'mapMarker',
'memory',
Expand Down
30 changes: 30 additions & 0 deletions src/components/icon/__snapshots__/icon.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4752,6 +4752,36 @@ exports[`EuiIcon props type magnet is rendered 1`] = `
</svg>
`;

exports[`EuiIcon props type magnifyWithMinus is rendered 1`] = `
<svg
class="euiIcon euiIcon--medium euiIcon-isLoaded"
focusable="false"
height="16"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M11.271 11.978a.5.5 0 0 1-.034-.738 6.01 6.01 0 0 0 0-8.486c-2.341-2.34-6.147-2.34-8.484 0a6.01 6.01 0 0 0 0 8.486 5.96 5.96 0 0 0 4.242 1.757.5.5 0 0 1 0 1 6.955 6.955 0 0 1-4.949-2.05c-2.728-2.73-2.728-7.171 0-9.9 2.728-2.73 7.168-2.73 9.898 0 2.609 2.61 2.723 6.785.342 9.532l3.565 3.564a.502.502 0 0 1-.708.708l-3.872-3.873zM10.5 6.5a.5.5 0 1 1 0 1h-7a.5.5 0 0 1 0-1h7z"
/>
</svg>
`;

exports[`EuiIcon props type magnifyWithPlus is rendered 1`] = `
<svg
class="euiIcon euiIcon--medium euiIcon-isLoaded"
focusable="false"
height="16"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M11.271 11.978a.5.5 0 0 1-.034-.738 6.01 6.01 0 0 0 0-8.486c-2.341-2.34-6.147-2.34-8.484 0a6.01 6.01 0 0 0 0 8.486 5.96 5.96 0 0 0 4.242 1.757.5.5 0 0 1 0 1 6.955 6.955 0 0 1-4.949-2.05c-2.728-2.73-2.728-7.171 0-9.9 2.728-2.73 7.168-2.73 9.898 0 2.609 2.61 2.723 6.785.342 9.532l3.565 3.564a.502.502 0 0 1-.708.708l-3.872-3.873zM7.5 6.5h3a.5.5 0 1 1 0 1h-3v3a.5.5 0 1 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0v3z"
/>
</svg>
`;

exports[`EuiIcon props type managementApp is rendered 1`] = `
<svg
class="euiIcon euiIcon--medium euiIcon--app euiIcon-isLoaded"
Expand Down
14 changes: 14 additions & 0 deletions src/components/icon/assets/magnifyWithMinus.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from 'react';

const EuiIconMagnifyWithMinus = props => (
<svg
width={16}
height={16}
viewBox="0 0 16 16"
xmlns="http://www.w3.org/2000/svg"
{...props}>
<path d="M11.271 11.978a.5.5 0 0 1-.034-.738 6.01 6.01 0 0 0 0-8.486c-2.341-2.34-6.147-2.34-8.484 0a6.01 6.01 0 0 0 0 8.486 5.96 5.96 0 0 0 4.242 1.757.5.5 0 0 1 0 1 6.955 6.955 0 0 1-4.949-2.05c-2.728-2.73-2.728-7.171 0-9.9 2.728-2.73 7.168-2.73 9.898 0 2.609 2.61 2.723 6.785.342 9.532l3.565 3.564a.502.502 0 0 1-.708.708l-3.872-3.873zM10.5 6.5a.5.5 0 1 1 0 1h-7a.5.5 0 0 1 0-1h7z" />
</svg>
);

export const icon = EuiIconMagnifyWithMinus;
3 changes: 3 additions & 0 deletions src/components/icon/assets/magnifyWithMinus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions src/components/icon/assets/magnifyWithPlus.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from 'react';

const EuiIconMagnifyWithPlus = props => (
<svg
width={16}
height={16}
viewBox="0 0 16 16"
xmlns="http://www.w3.org/2000/svg"
{...props}>
<path d="M11.271 11.978a.5.5 0 0 1-.034-.738 6.01 6.01 0 0 0 0-8.486c-2.341-2.34-6.147-2.34-8.484 0a6.01 6.01 0 0 0 0 8.486 5.96 5.96 0 0 0 4.242 1.757.5.5 0 0 1 0 1 6.955 6.955 0 0 1-4.949-2.05c-2.728-2.73-2.728-7.171 0-9.9 2.728-2.73 7.168-2.73 9.898 0 2.609 2.61 2.723 6.785.342 9.532l3.565 3.564a.502.502 0 0 1-.708.708l-3.872-3.873zM7.5 6.5h3a.5.5 0 1 1 0 1h-3v3a.5.5 0 1 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0v3z" />
</svg>
);

export const icon = EuiIconMagnifyWithPlus;
3 changes: 3 additions & 0 deletions src/components/icon/assets/magnifyWithPlus.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.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ const typeToPathMap = {
logstashQueue: 'logstash_queue',
machineLearningApp: 'app_ml',
magnet: 'magnet',
magnifyWithMinus: 'magnifyWithMinus',
magnifyWithPlus: 'magnifyWithPlus',
managementApp: 'app_management',
mapMarker: 'map_marker',
memory: 'memory',
Expand Down

0 comments on commit d001aea

Please sign in to comment.