From 39a5e11c8e8bf3b60f63d7066b21889fbd95c9ec Mon Sep 17 00:00:00 2001 From: cchaos Date: Fri, 14 Dec 2018 01:37:47 -0500 Subject: [PATCH 1/5] Updated and added some icons --- src-docs/src/views/button/button_toggle.js | 2 +- src-docs/src/views/button/button_with_icon.js | 8 +- src-docs/src/views/icon/icons.js | 276 ++++++----- .../flyout/__snapshots__/flyout.test.js.snap | 84 +--- .../form_control_layout.test.js.snap | 60 +-- .../form/form_control_layout/_mixins.scss | 4 +- .../__snapshots__/super_select.test.js.snap | 2 + .../switch/__snapshots__/switch.test.js.snap | 13 +- .../__snapshots__/header_logo.test.js.snap | 12 +- .../__snapshots__/header_alert.test.js.snap | 48 +- .../icon/__snapshots__/icon.test.tsx.snap | 449 +++++++++++------- src/components/icon/assets/alert.svg | 6 +- src/components/icon/assets/bolt.svg | 9 +- src/components/icon/assets/branch.svg | 9 +- src/components/icon/assets/bullseye.svg | 9 +- src/components/icon/assets/check.svg | 4 +- .../icon/assets/checkInCircleFilled.svg | 4 +- src/components/icon/assets/clock.svg | 9 +- .../icon/assets/controls_horizontal.svg | 9 +- .../icon/assets/controls_vertical.svg | 9 +- src/components/icon/assets/cross.svg | 9 +- .../icon/assets/crossInACircleFilled.svg | 3 + .../icon/assets/editor_code_block.svg | 9 +- src/components/icon/assets/editor_redo.svg | 9 +- .../icon/assets/editor_underline.svg | 9 +- src/components/icon/assets/editor_undo.svg | 9 +- src/components/icon/assets/exit.svg | 4 +- src/components/icon/assets/expand.svg | 4 +- src/components/icon/assets/folder_closed.svg | 4 +- src/components/icon/assets/folder_open.svg | 4 +- src/components/icon/assets/grab.svg | 2 +- .../icon/assets/grab_horizontal.svg | 3 + src/components/icon/assets/iInCircle.svg | 4 +- src/components/icon/assets/index_close.svg | 2 +- src/components/icon/assets/index_open.svg | 2 +- src/components/icon/assets/link.svg | 9 +- src/components/icon/assets/list.svg | 9 +- src/components/icon/assets/list_add.svg | 2 +- .../icon/assets/minus_in_circle.svg | 4 +- .../icon/assets/minus_in_circle_filled.svg | 3 + src/components/icon/assets/offline.svg | 4 +- src/components/icon/assets/online.svg | 4 +- src/components/icon/assets/pause.svg | 4 +- src/components/icon/assets/play.svg | 4 +- src/components/icon/assets/plus_in_circle.svg | 9 +- .../icon/assets/plus_in_circle_filled.svg | 3 + src/components/icon/assets/popout.svg | 4 +- .../icon/assets/question_in_circle.svg | 5 +- src/components/icon/assets/refresh.svg | 4 +- src/components/icon/assets/scale.svg | 4 +- src/components/icon/assets/share.svg | 4 +- src/components/icon/assets/sortLeft.svg | 6 +- src/components/icon/assets/sortRight.svg | 4 +- src/components/icon/assets/sort_down.svg | 9 +- src/components/icon/assets/sort_up.svg | 9 +- src/components/icon/assets/sortable.svg | 3 + src/components/icon/assets/starPlusEmpty.svg | 3 + src/components/icon/assets/starPlusFilled.svg | 4 +- src/components/icon/assets/star_empty.svg | 9 +- .../icon/assets/star_empty_space.svg | 3 + src/components/icon/assets/star_filled.svg | 3 + .../icon/assets/star_filled_space.svg | 3 + .../icon/assets/star_minus_empty.svg | 3 + .../icon/assets/star_minus_filled.svg | 3 + src/components/icon/assets/wrench.svg | 5 +- src/components/icon/icon.tsx | 126 +++-- .../__snapshots__/confirm_modal.test.js.snap | 12 +- .../modal/__snapshots__/modal.test.js.snap | 12 +- .../__snapshots__/step_number.test.js.snap | 25 +- .../steps_horizontal.test.js.snap | 1 + src/components/steps/_mixins.scss | 2 +- .../global_toast_list.test.js.snap | 37 +- .../__snapshots__/icon_tip.test.js.snap | 27 +- 73 files changed, 699 insertions(+), 789 deletions(-) create mode 100644 src/components/icon/assets/crossInACircleFilled.svg create mode 100644 src/components/icon/assets/grab_horizontal.svg create mode 100644 src/components/icon/assets/minus_in_circle_filled.svg create mode 100644 src/components/icon/assets/plus_in_circle_filled.svg create mode 100644 src/components/icon/assets/sortable.svg create mode 100644 src/components/icon/assets/starPlusEmpty.svg create mode 100644 src/components/icon/assets/star_empty_space.svg create mode 100644 src/components/icon/assets/star_filled.svg create mode 100644 src/components/icon/assets/star_filled_space.svg create mode 100644 src/components/icon/assets/star_minus_empty.svg create mode 100644 src/components/icon/assets/star_minus_filled.svg diff --git a/src-docs/src/views/button/button_toggle.js b/src-docs/src/views/button/button_toggle.js index e6772ee33fe..ac22cdb7275 100644 --- a/src-docs/src/views/button/button_toggle.js +++ b/src-docs/src/views/button/button_toggle.js @@ -36,7 +36,7 @@ export default class extends Component {
diff --git a/src-docs/src/views/button/button_with_icon.js b/src-docs/src/views/button/button_with_icon.js index bcfe10394dd..4699860ba3c 100644 --- a/src-docs/src/views/button/button_with_icon.js +++ b/src-docs/src/views/button/button_with_icon.js @@ -12,7 +12,7 @@ export default () => ( window.alert('Button clicked')} - iconType="arrowUp" + iconType="folderOpen" > Primary @@ -21,7 +21,7 @@ export default () => ( window.alert('Button clicked')} > Filled @@ -30,7 +30,7 @@ export default () => ( window.alert('Button clicked')} > @@ -40,7 +40,7 @@ export default () => ( window.alert('Button clicked')} diff --git a/src-docs/src/views/icon/icons.js b/src-docs/src/views/icon/icons.js index 3c3fbda4ca7..8736b11ac9f 100644 --- a/src-docs/src/views/icon/icons.js +++ b/src-docs/src/views/icon/icons.js @@ -9,155 +9,207 @@ import { } from '../../../../src/components'; const iconTypes = [ + // 'alert', + // 'apmTrace', + // 'apps', + // 'arrowDown', + // 'arrowLeft', + // 'arrowRight', + // 'arrowUp', + // 'asterisk', + // 'beaker', + // 'bolt', + // 'boxesHorizontal', + // 'boxesVertical', + // 'branch', + // 'broom', + // 'brush', + // 'bullseye', + // 'calendar', + // 'check', + // 'checkInCircleFilled', + // 'clock', + // 'compute', + // 'console', + // 'controlsHorizontal', + // 'controlsVertical', + // 'copy', + // 'copyClipboard', + // 'cross', + // 'crosshairs', + // 'database', + // 'document', + // 'dot', + // 'editorAlignCenter', + // 'editorAlignLeft', + // 'editorAlignRight', + // 'editorBold', + // 'editorCodeBlock', + // 'editorComment', + // 'editorHeading', + // 'editorItalic', + // 'editorLink', + // 'editorStrike', + // 'editorTable', + // 'editorUnderline', + // 'editorOrderedList', + // 'editorUnorderedList', + // 'email', + // 'empty', + // 'exit', + // 'expand', + // 'exportAction', + // 'eye', + // 'eyeClosed', + // 'faceHappy', + // 'faceNeutral', + // 'faceSad', + // 'filter', + // 'folderClosed', + // 'folderOpen', + // 'fullScreen', + // 'gear', + // 'globe', + // 'grab', + // 'grid', + // 'heatmap', + // 'help', + // 'iInCircle', + // 'importAction', + // 'indexClose', + // 'indexEdit', + // 'indexFlush', + // 'indexMapping', + // 'indexOpen', + // 'indexSettings', + // 'inspect', + // 'invert', + // 'inputOutput', + // 'kqlField', + // 'kqlOperand', + // 'kqlValue', + // 'kqlFunction', + // 'kqlSelector', + // 'link', + // 'list', + // 'listAdd', + // 'lock', + // 'lockOpen', + // 'logstashFilter', + // 'logstashIf', + // 'logstashInput', + // 'logstashOutput', + // 'logstashQueue', + // 'mapMarker', + // 'merge', + // 'memory', + // 'minusInCircle', + // 'node', + // 'number', + // 'offline', + // 'online', + // 'pause', + // 'pencil', + // 'pin', + // 'play', + // 'plusInCircle', + // 'popout', + // 'questionInCircle', + // 'refresh', + // 'save', + // 'scale', + // 'search', + // 'shard', + // 'share', + // 'sortDown', + // 'sortLeft', + // 'sortRight', + // 'sortUp', + // 'starEmpty', + // 'starPlusFilled', + // 'stats', + // 'stop', + // 'stopFilled', + // 'storage', + // 'string', + // 'temperature', + // 'tableOfContents', + // 'tag', + // 'tear', + // 'trash', + // 'user', + // 'vector', + // 'wrench', + // 'visArea', + // 'visBarHorizontal', + // 'visBarVertical', + // 'visControls', + // 'visGauge', + // 'visGoal', + // 'visHeatmap', + // 'visLine', + // 'visMapCoordinate', + // 'visMapRegion', + // 'visMetric', + // 'visPie', + // 'visTable', + // 'visTagCloud', + // 'visText', + // 'visTimelion', + // 'visVega', + // 'visVisualBuilder' 'alert', - 'apmTrace', - 'apps', - 'arrowDown', - 'arrowLeft', - 'arrowRight', - 'arrowUp', - 'asterisk', - 'beaker', - 'bolt', - 'boxesHorizontal', - 'boxesVertical', 'branch', - 'broom', - 'brush', 'bullseye', - 'calendar', 'check', 'checkInCircleFilled', 'clock', - 'compute', - 'console', 'controlsHorizontal', 'controlsVertical', - 'copy', - 'copyClipboard', 'cross', - 'crosshairs', - 'database', - 'document', - 'dot', - 'editorAlignCenter', - 'editorAlignLeft', - 'editorAlignRight', - 'editorBold', + 'crossInACircleFilled', 'editorCodeBlock', - 'editorComment', - 'editorHeading', - 'editorItalic', - 'editorLink', - 'editorStrike', - 'editorTable', + 'editorRedo', 'editorUnderline', - 'editorOrderedList', - 'editorUnorderedList', - 'email', - 'empty', + 'editorUndo', 'exit', 'expand', - 'exportAction', - 'eye', - 'eyeClosed', - 'faceHappy', - 'faceNeutral', - 'faceSad', - 'filter', 'folderClosed', 'folderOpen', - 'fullScreen', - 'gear', - 'globe', + 'grabHorizontal', 'grab', - 'grid', - 'heatmap', - 'help', 'iInCircle', - 'importAction', 'indexClose', - 'indexEdit', - 'indexFlush', - 'indexMapping', 'indexOpen', - 'indexSettings', - 'inspect', - 'invert', - 'inputOutput', - 'kqlField', - 'kqlOperand', - 'kqlValue', - 'kqlFunction', - 'kqlSelector', 'link', - 'list', 'listAdd', - 'lock', - 'lockOpen', - 'logstashFilter', - 'logstashIf', - 'logstashInput', - 'logstashOutput', - 'logstashQueue', - 'mapMarker', - 'merge', - 'memory', + 'list', + 'minusInCircleFilled', 'minusInCircle', - 'node', - 'number', 'offline', 'online', 'pause', - 'pencil', - 'pin', 'play', + 'plusInCircleFilled', 'plusInCircle', 'popout', 'questionInCircle', 'refresh', - 'save', 'scale', - 'search', - 'shard', - 'share', 'sortDown', + 'sortUp', + 'sortable', 'sortLeft', 'sortRight', - 'sortUp', + 'starEmptySpace', 'starEmpty', + 'starFilledSpace', + 'starFilled', + 'starMinusEmpty', + 'starMinusFilled', + 'starPlusEmpty', 'starPlusFilled', - 'stats', - 'stop', - 'stopFilled', - 'storage', - 'string', - 'temperature', - 'tableOfContents', - 'tag', - 'tear', - 'trash', - 'user', - 'vector', 'wrench', - 'visArea', - 'visBarHorizontal', - 'visBarVertical', - 'visControls', - 'visGauge', - 'visGoal', - 'visHeatmap', - 'visLine', - 'visMapCoordinate', - 'visMapRegion', - 'visMetric', - 'visPie', - 'visTable', - 'visTagCloud', - 'visText', - 'visTimelion', - 'visVega', - 'visVisualBuilder' ]; export default () => ( diff --git a/src/components/flyout/__snapshots__/flyout.test.js.snap b/src/components/flyout/__snapshots__/flyout.test.js.snap index f3178669bb2..04324b2c296 100644 --- a/src/components/flyout/__snapshots__/flyout.test.js.snap +++ b/src/components/flyout/__snapshots__/flyout.test.js.snap @@ -23,18 +23,10 @@ exports[`EuiFlyout is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - @@ -65,18 +57,10 @@ exports[`EuiFlyout max width can be set to a custom number 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - @@ -107,18 +91,10 @@ exports[`EuiFlyout max width can be set to a custom value and measurement 1`] = height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - @@ -148,18 +124,10 @@ exports[`EuiFlyout max width can be set to a default 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - @@ -201,18 +169,10 @@ exports[`EuiFlyout size l is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - @@ -242,18 +202,10 @@ exports[`EuiFlyout size m is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - @@ -283,18 +235,10 @@ exports[`EuiFlyout size s is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - diff --git a/src/components/form/form_control_layout/__snapshots__/form_control_layout.test.js.snap b/src/components/form/form_control_layout/__snapshots__/form_control_layout.test.js.snap index 9de76c91e2b..a7534a7ccab 100644 --- a/src/components/form/form_control_layout/__snapshots__/form_control_layout.test.js.snap +++ b/src/components/form/form_control_layout/__snapshots__/form_control_layout.test.js.snap @@ -35,18 +35,10 @@ exports[`EuiFormControlLayout props clear onClick is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - @@ -87,16 +79,10 @@ exports[`EuiFormControlLayout props icon is rendered as a string 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - + />
@@ -127,16 +113,10 @@ exports[`EuiFormControlLayout props icon is rendered as an object 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - + /> @@ -166,16 +146,10 @@ exports[`EuiFormControlLayout props icon side left is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - + /> @@ -205,16 +179,10 @@ exports[`EuiFormControlLayout props icon side right is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - + /> diff --git a/src/components/form/form_control_layout/_mixins.scss b/src/components/form/form_control_layout/_mixins.scss index 59562b6f56f..5bc62f7828c 100644 --- a/src/components/form/form_control_layout/_mixins.scss +++ b/src/components/form/form_control_layout/_mixins.scss @@ -29,7 +29,7 @@ @include size($euiSizeS); fill: $euiColorEmptyShade; stroke: $euiColorEmptyShade; - stroke-width: 3px; // increase thickness of icon at such a small size + stroke-width: 2px; // increase thickness of icon at such a small size } } @@ -38,4 +38,4 @@ @mixin euiFormControlLayout__padding($numOfIcons, $side: 'right') { // sass-lint:disable-line mixin-name-format @include euiFormControlLayoutPadding($numOfIcons, $side: 'right'); @warn '@mixin euiFormControlLayout__padding is deprecated, please use euiFormControlLayoutPadding instead'; -} \ No newline at end of file +} diff --git a/src/components/form/super_select/__snapshots__/super_select.test.js.snap b/src/components/form/super_select/__snapshots__/super_select.test.js.snap index 7d57846836d..99d8bfd21ae 100644 --- a/src/components/form/super_select/__snapshots__/super_select.test.js.snap +++ b/src/components/form/super_select/__snapshots__/super_select.test.js.snap @@ -376,6 +376,7 @@ exports[`EuiSuperSelect props more props are propogated to each option 1`] = ` > diff --git a/src/components/form/switch/__snapshots__/switch.test.js.snap b/src/components/form/switch/__snapshots__/switch.test.js.snap index 1e7b46f8300..40be4bfbf4f 100644 --- a/src/components/form/switch/__snapshots__/switch.test.js.snap +++ b/src/components/form/switch/__snapshots__/switch.test.js.snap @@ -26,18 +26,10 @@ exports[`EuiSwitch is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - diff --git a/src/components/header/__snapshots__/header_logo.test.js.snap b/src/components/header/__snapshots__/header_logo.test.js.snap index c63f4338ffa..960c5da9ae1 100644 --- a/src/components/header/__snapshots__/header_logo.test.js.snap +++ b/src/components/header/__snapshots__/header_logo.test.js.snap @@ -107,16 +107,10 @@ exports[`EuiHeaderLogo renders optional props 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - + /> `; diff --git a/src/components/header/header_alert/__snapshots__/header_alert.test.js.snap b/src/components/header/header_alert/__snapshots__/header_alert.test.js.snap index 4c7a596f9a5..87fd481048c 100644 --- a/src/components/header/header_alert/__snapshots__/header_alert.test.js.snap +++ b/src/components/header/header_alert/__snapshots__/header_alert.test.js.snap @@ -18,18 +18,10 @@ exports[`EuiHeaderAlert is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - @@ -82,18 +74,10 @@ exports[`EuiHeaderAlert renders action 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - @@ -150,18 +134,10 @@ exports[`EuiHeaderAlert renders date as an element 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - @@ -216,18 +192,10 @@ exports[`EuiHeaderAlert renders title as an element 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index 9a43ed394a9..4637c7e3e53 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -466,16 +466,10 @@ exports[`EuiIcon props type alert is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - + /> `; @@ -697,17 +691,10 @@ exports[`EuiIcon props type bolt is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - `; @@ -763,17 +750,10 @@ exports[`EuiIcon props type branch is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - `; @@ -822,17 +802,10 @@ exports[`EuiIcon props type bullseye is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - `; @@ -883,6 +856,7 @@ exports[`EuiIcon props type check is rendered 1`] = ` > `; @@ -897,7 +871,7 @@ exports[`EuiIcon props type checkInCircleFilled is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -910,17 +884,11 @@ exports[`EuiIcon props type clock is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - `; @@ -998,18 +966,11 @@ exports[`EuiIcon props type controlsHorizontal is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - `; @@ -1021,17 +982,11 @@ exports[`EuiIcon props type controlsVertical is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - `; @@ -1162,18 +1117,10 @@ exports[`EuiIcon props type cross is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - `; @@ -1197,6 +1144,21 @@ exports[`EuiIcon props type crossClusterReplicationApp is rendered 1`] = ` `; +exports[`EuiIcon props type crossInACircleFilled is rendered 1`] = ` + + + +`; + exports[`EuiIcon props type crosshairs is rendered 1`] = ` - - - - `; @@ -1576,6 +1531,21 @@ exports[`EuiIcon props type editorOrderedList is rendered 1`] = ` `; +exports[`EuiIcon props type editorRedo is rendered 1`] = ` + + + +`; + exports[`EuiIcon props type editorStrike is rendered 1`] = ` - - - - + +`; + +exports[`EuiIcon props type editorUndo is rendered 1`] = ` + + `; @@ -1727,7 +1705,7 @@ exports[`EuiIcon props type exit is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -1743,7 +1721,7 @@ exports[`EuiIcon props type expand is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -1885,7 +1863,7 @@ exports[`EuiIcon props type folderClosed is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -1900,7 +1878,7 @@ exports[`EuiIcon props type folderOpen is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -1994,7 +1972,23 @@ exports[`EuiIcon props type grab is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > + +`; + +exports[`EuiIcon props type grabHorizontal is rendered 1`] = ` + + @@ -2127,7 +2121,7 @@ exports[`EuiIcon props type iInCircle is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -2158,7 +2152,7 @@ exports[`EuiIcon props type indexClose is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -2241,7 +2235,7 @@ exports[`EuiIcon props type indexOpen is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -2469,17 +2463,10 @@ exports[`EuiIcon props type link is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - `; @@ -2491,18 +2478,10 @@ exports[`EuiIcon props type list is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - `; @@ -2517,7 +2496,7 @@ exports[`EuiIcon props type listAdd is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -4628,7 +4607,24 @@ exports[`EuiIcon props type minusInCircle is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > + +`; + +exports[`EuiIcon props type minusInCircleFilled is rendered 1`] = ` + + `; @@ -4715,7 +4711,7 @@ exports[`EuiIcon props type offline is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -4730,7 +4726,7 @@ exports[`EuiIcon props type online is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -4764,7 +4760,7 @@ exports[`EuiIcon props type pause is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -4837,7 +4833,7 @@ exports[`EuiIcon props type play is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -4849,17 +4845,26 @@ exports[`EuiIcon props type plusInCircle is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - + +`; + +exports[`EuiIcon props type plusInCircleFilled is rendered 1`] = ` + + `; @@ -4874,7 +4879,7 @@ exports[`EuiIcon props type popout is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -4890,10 +4895,7 @@ exports[`EuiIcon props type questionInCircle is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > - `; @@ -4908,8 +4910,7 @@ exports[`EuiIcon props type refresh is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -4980,7 +4981,7 @@ exports[`EuiIcon props type scale is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -5100,7 +5101,7 @@ exports[`EuiIcon props type share is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -5112,19 +5113,10 @@ exports[`EuiIcon props type sortDown is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - `; @@ -5139,7 +5131,8 @@ exports[`EuiIcon props type sortLeft is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -5154,7 +5147,7 @@ exports[`EuiIcon props type sortRight is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -5166,18 +5159,25 @@ exports[`EuiIcon props type sortUp is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - + +`; + +exports[`EuiIcon props type sortable is rendered 1`] = ` + + `; @@ -5231,17 +5231,107 @@ exports[`EuiIcon props type starEmpty is rendered 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - + +`; + +exports[`EuiIcon props type starEmptySpace is rendered 1`] = ` + + + +`; + +exports[`EuiIcon props type starFilled is rendered 1`] = ` + + + +`; + +exports[`EuiIcon props type starFilledSpace is rendered 1`] = ` + + + +`; + +exports[`EuiIcon props type starMinusEmpty is rendered 1`] = ` + + + +`; + +exports[`EuiIcon props type starMinusFilled is rendered 1`] = ` + + + +`; + +exports[`EuiIcon props type starPlusEmpty is rendered 1`] = ` + + `; @@ -5256,7 +5346,7 @@ exports[`EuiIcon props type starPlusFilled is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -6326,10 +6416,7 @@ exports[`EuiIcon props type wrench is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > - `; diff --git a/src/components/icon/assets/alert.svg b/src/components/icon/assets/alert.svg index bb14a00ba1f..5addb1f566b 100644 --- a/src/components/icon/assets/alert.svg +++ b/src/components/icon/assets/alert.svg @@ -1,7 +1,3 @@ - - - - - + diff --git a/src/components/icon/assets/bolt.svg b/src/components/icon/assets/bolt.svg index 39476ae8e95..6ebf6810062 100644 --- a/src/components/icon/assets/bolt.svg +++ b/src/components/icon/assets/bolt.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/branch.svg b/src/components/icon/assets/branch.svg index 2623c9ee61a..c78232177c1 100644 --- a/src/components/icon/assets/branch.svg +++ b/src/components/icon/assets/branch.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/bullseye.svg b/src/components/icon/assets/bullseye.svg index 0cbeaf87e0d..461b09470be 100644 --- a/src/components/icon/assets/bullseye.svg +++ b/src/components/icon/assets/bullseye.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/check.svg b/src/components/icon/assets/check.svg index 7e747e5085c..5a87b2ea456 100644 --- a/src/components/icon/assets/check.svg +++ b/src/components/icon/assets/check.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/checkInCircleFilled.svg b/src/components/icon/assets/checkInCircleFilled.svg index 05687866e4c..410cd1cd61b 100644 --- a/src/components/icon/assets/checkInCircleFilled.svg +++ b/src/components/icon/assets/checkInCircleFilled.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/clock.svg b/src/components/icon/assets/clock.svg index 17760bccccb..993574d5a10 100644 --- a/src/components/icon/assets/clock.svg +++ b/src/components/icon/assets/clock.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/controls_horizontal.svg b/src/components/icon/assets/controls_horizontal.svg index f56c4460a0a..1dc0a116e29 100644 --- a/src/components/icon/assets/controls_horizontal.svg +++ b/src/components/icon/assets/controls_horizontal.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/controls_vertical.svg b/src/components/icon/assets/controls_vertical.svg index e53ac3277e1..1ac410757b8 100644 --- a/src/components/icon/assets/controls_vertical.svg +++ b/src/components/icon/assets/controls_vertical.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/cross.svg b/src/components/icon/assets/cross.svg index 9be13df9aea..932e6a329e3 100644 --- a/src/components/icon/assets/cross.svg +++ b/src/components/icon/assets/cross.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/crossInACircleFilled.svg b/src/components/icon/assets/crossInACircleFilled.svg new file mode 100644 index 00000000000..d8dac79c53a --- /dev/null +++ b/src/components/icon/assets/crossInACircleFilled.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/editor_code_block.svg b/src/components/icon/assets/editor_code_block.svg index 609b6e808ac..77b696292c3 100644 --- a/src/components/icon/assets/editor_code_block.svg +++ b/src/components/icon/assets/editor_code_block.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/editor_redo.svg b/src/components/icon/assets/editor_redo.svg index b9105d0e8f2..d0fbcf0c314 100644 --- a/src/components/icon/assets/editor_redo.svg +++ b/src/components/icon/assets/editor_redo.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/editor_underline.svg b/src/components/icon/assets/editor_underline.svg index 46aeebc2766..fc1a589f45a 100644 --- a/src/components/icon/assets/editor_underline.svg +++ b/src/components/icon/assets/editor_underline.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/editor_undo.svg b/src/components/icon/assets/editor_undo.svg index 5697a2b8f90..0e679119f18 100644 --- a/src/components/icon/assets/editor_undo.svg +++ b/src/components/icon/assets/editor_undo.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/exit.svg b/src/components/icon/assets/exit.svg index 1da9276e67b..10172876f86 100644 --- a/src/components/icon/assets/exit.svg +++ b/src/components/icon/assets/exit.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/expand.svg b/src/components/icon/assets/expand.svg index 9afe352aee4..b7eb1ce5602 100644 --- a/src/components/icon/assets/expand.svg +++ b/src/components/icon/assets/expand.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/folder_closed.svg b/src/components/icon/assets/folder_closed.svg index 0d4e61d3d08..440a777312c 100644 --- a/src/components/icon/assets/folder_closed.svg +++ b/src/components/icon/assets/folder_closed.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/folder_open.svg b/src/components/icon/assets/folder_open.svg index bfc19ad2349..bf6a16fa2ad 100644 --- a/src/components/icon/assets/folder_open.svg +++ b/src/components/icon/assets/folder_open.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/grab.svg b/src/components/icon/assets/grab.svg index 4193857ec18..26560ffd6f8 100644 --- a/src/components/icon/assets/grab.svg +++ b/src/components/icon/assets/grab.svg @@ -1,3 +1,3 @@ - + diff --git a/src/components/icon/assets/grab_horizontal.svg b/src/components/icon/assets/grab_horizontal.svg new file mode 100644 index 00000000000..35f7a1d91af --- /dev/null +++ b/src/components/icon/assets/grab_horizontal.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/iInCircle.svg b/src/components/icon/assets/iInCircle.svg index 81b0b64698b..a2f3a83c4d3 100644 --- a/src/components/icon/assets/iInCircle.svg +++ b/src/components/icon/assets/iInCircle.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/index_close.svg b/src/components/icon/assets/index_close.svg index 4c5b69ea8b0..88318014065 100644 --- a/src/components/icon/assets/index_close.svg +++ b/src/components/icon/assets/index_close.svg @@ -1,3 +1,3 @@ - + diff --git a/src/components/icon/assets/index_open.svg b/src/components/icon/assets/index_open.svg index e12a6e497a9..7cceb33221a 100644 --- a/src/components/icon/assets/index_open.svg +++ b/src/components/icon/assets/index_open.svg @@ -1,3 +1,3 @@ - + diff --git a/src/components/icon/assets/link.svg b/src/components/icon/assets/link.svg index 2683f5fd0b7..310607d5469 100644 --- a/src/components/icon/assets/link.svg +++ b/src/components/icon/assets/link.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/list.svg b/src/components/icon/assets/list.svg index 0b6cae93f04..0e3980f09f8 100644 --- a/src/components/icon/assets/list.svg +++ b/src/components/icon/assets/list.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/list_add.svg b/src/components/icon/assets/list_add.svg index 63dae87d84b..d950be2fcb4 100644 --- a/src/components/icon/assets/list_add.svg +++ b/src/components/icon/assets/list_add.svg @@ -1,3 +1,3 @@ - + diff --git a/src/components/icon/assets/minus_in_circle.svg b/src/components/icon/assets/minus_in_circle.svg index 98280dcb7d7..1561a166684 100644 --- a/src/components/icon/assets/minus_in_circle.svg +++ b/src/components/icon/assets/minus_in_circle.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/minus_in_circle_filled.svg b/src/components/icon/assets/minus_in_circle_filled.svg new file mode 100644 index 00000000000..7f4cc7f172a --- /dev/null +++ b/src/components/icon/assets/minus_in_circle_filled.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/offline.svg b/src/components/icon/assets/offline.svg index c8b880a54c5..3921a3fa515 100644 --- a/src/components/icon/assets/offline.svg +++ b/src/components/icon/assets/offline.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/online.svg b/src/components/icon/assets/online.svg index 1ed0c853847..0fc3d72bd0c 100644 --- a/src/components/icon/assets/online.svg +++ b/src/components/icon/assets/online.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/pause.svg b/src/components/icon/assets/pause.svg index d157e748a56..d60e389f439 100644 --- a/src/components/icon/assets/pause.svg +++ b/src/components/icon/assets/pause.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/play.svg b/src/components/icon/assets/play.svg index 632477c5f68..bbd95d8e436 100644 --- a/src/components/icon/assets/play.svg +++ b/src/components/icon/assets/play.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/plus_in_circle.svg b/src/components/icon/assets/plus_in_circle.svg index 30855ff2ad4..58e26719fe1 100644 --- a/src/components/icon/assets/plus_in_circle.svg +++ b/src/components/icon/assets/plus_in_circle.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/plus_in_circle_filled.svg b/src/components/icon/assets/plus_in_circle_filled.svg new file mode 100644 index 00000000000..b4d5f11ba55 --- /dev/null +++ b/src/components/icon/assets/plus_in_circle_filled.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/popout.svg b/src/components/icon/assets/popout.svg index 8dc9be4f69a..0199b37afe6 100644 --- a/src/components/icon/assets/popout.svg +++ b/src/components/icon/assets/popout.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/question_in_circle.svg b/src/components/icon/assets/question_in_circle.svg index 0c55d080daa..6ba56e94aa1 100644 --- a/src/components/icon/assets/question_in_circle.svg +++ b/src/components/icon/assets/question_in_circle.svg @@ -1,6 +1,3 @@ - - - - + diff --git a/src/components/icon/assets/refresh.svg b/src/components/icon/assets/refresh.svg index 51cd5ca68ac..26633915e46 100644 --- a/src/components/icon/assets/refresh.svg +++ b/src/components/icon/assets/refresh.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/scale.svg b/src/components/icon/assets/scale.svg index e61136a089b..4ef2e9df29a 100644 --- a/src/components/icon/assets/scale.svg +++ b/src/components/icon/assets/scale.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/share.svg b/src/components/icon/assets/share.svg index a8fda26a9af..9f6269b96ec 100644 --- a/src/components/icon/assets/share.svg +++ b/src/components/icon/assets/share.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/sortLeft.svg b/src/components/icon/assets/sortLeft.svg index e99b050bf9b..accf16c7512 100644 --- a/src/components/icon/assets/sortLeft.svg +++ b/src/components/icon/assets/sortLeft.svg @@ -1,3 +1,5 @@ - - + + + + diff --git a/src/components/icon/assets/sortRight.svg b/src/components/icon/assets/sortRight.svg index eceaf076d70..560b39ae743 100644 --- a/src/components/icon/assets/sortRight.svg +++ b/src/components/icon/assets/sortRight.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/sort_down.svg b/src/components/icon/assets/sort_down.svg index 52300b5ce21..eaf4e8e360d 100644 --- a/src/components/icon/assets/sort_down.svg +++ b/src/components/icon/assets/sort_down.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/sort_up.svg b/src/components/icon/assets/sort_up.svg index 661d85b7844..50fbebcdfd6 100644 --- a/src/components/icon/assets/sort_up.svg +++ b/src/components/icon/assets/sort_up.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/sortable.svg b/src/components/icon/assets/sortable.svg new file mode 100644 index 00000000000..f1dedf4de85 --- /dev/null +++ b/src/components/icon/assets/sortable.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/starPlusEmpty.svg b/src/components/icon/assets/starPlusEmpty.svg new file mode 100644 index 00000000000..1657df21a4f --- /dev/null +++ b/src/components/icon/assets/starPlusEmpty.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/starPlusFilled.svg b/src/components/icon/assets/starPlusFilled.svg index 0e9c5b0ad50..4bfe64a05de 100644 --- a/src/components/icon/assets/starPlusFilled.svg +++ b/src/components/icon/assets/starPlusFilled.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/star_empty.svg b/src/components/icon/assets/star_empty.svg index 18bfa69a2bf..64211fe37c0 100644 --- a/src/components/icon/assets/star_empty.svg +++ b/src/components/icon/assets/star_empty.svg @@ -1,8 +1,3 @@ - - - - - - - + + diff --git a/src/components/icon/assets/star_empty_space.svg b/src/components/icon/assets/star_empty_space.svg new file mode 100644 index 00000000000..b309f0fd78c --- /dev/null +++ b/src/components/icon/assets/star_empty_space.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/star_filled.svg b/src/components/icon/assets/star_filled.svg new file mode 100644 index 00000000000..afacb8883e5 --- /dev/null +++ b/src/components/icon/assets/star_filled.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/star_filled_space.svg b/src/components/icon/assets/star_filled_space.svg new file mode 100644 index 00000000000..9b5ecb993a3 --- /dev/null +++ b/src/components/icon/assets/star_filled_space.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/star_minus_empty.svg b/src/components/icon/assets/star_minus_empty.svg new file mode 100644 index 00000000000..062ed20c1c4 --- /dev/null +++ b/src/components/icon/assets/star_minus_empty.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/star_minus_filled.svg b/src/components/icon/assets/star_minus_filled.svg new file mode 100644 index 00000000000..35d98883d9d --- /dev/null +++ b/src/components/icon/assets/star_minus_filled.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/wrench.svg b/src/components/icon/assets/wrench.svg index 394a1106cb5..953b0864532 100644 --- a/src/components/icon/assets/wrench.svg +++ b/src/components/icon/assets/wrench.svg @@ -1,6 +1,3 @@ - - - - + diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index 78884a619a2..7ad0b1ddbeb 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -42,9 +42,10 @@ import createSingleMetricJob from './assets/ml_create_single_metric_job.svg'; import cross from './assets/cross.svg'; import crossClusterReplicationApp from './assets/app_cross_cluster_replication.svg'; import crosshairs from './assets/crosshairs.svg'; +import crossInACircleFilled from './assets/crossInACircleFilled.svg'; import dashboardApp from './assets/app_dashboard.svg'; -import dataVisualizer from './assets/ml_data_visualizer.svg'; import database from './assets/database.svg'; +import dataVisualizer from './assets/ml_data_visualizer.svg'; import devToolsApp from './assets/app_devtools.svg'; import discoverApp from './assets/app_discover.svg'; import document from './assets/document.svg'; @@ -59,9 +60,11 @@ import editorHeading from './assets/editor_heading.svg'; import editorItalic from './assets/editor_italic.svg'; import editorLink from './assets/editor_link.svg'; import editorOrderedList from './assets/editor_ordered_list.svg'; +import editorRedo from './assets/editor_redo.svg'; import editorStrike from './assets/editor_strike.svg'; import editorTable from './assets/editor_table.svg'; import editorUnderline from './assets/editor_underline.svg'; +import editorUndo from './assets/editor_undo.svg'; import editorUnorderedList from './assets/editor_unordered_list.svg'; import email from './assets/email.svg'; import empty from './assets/empty.svg'; @@ -83,6 +86,7 @@ import gear from './assets/gear.svg'; import gisApp from './assets/app_gis.svg'; import globe from './assets/globe.svg'; import grab from './assets/grab.svg'; +import grabHorizontal from './assets/grab_horizontal.svg'; import graphApp from './assets/app_graph.svg'; import grid from './assets/grid.svg'; import grokApp from './assets/app_grok.svg'; @@ -115,12 +119,12 @@ import listAdd from './assets/list_add.svg'; import lock from './assets/lock.svg'; import lockOpen from './assets/lockOpen.svg'; import loggingApp from './assets/app_logging.svg'; -import logoAPM from './assets/logo_apm.svg'; -import logoAWS from './assets/logo_aws.svg'; -import logoAWSMono from './assets/logo_aws_mono.svg'; import logoAerospike from './assets/logo_aerospike.svg'; import logoApache from './assets/logo_apache.svg'; +import logoAPM from './assets/logo_apm.svg'; import logoAppSearch from './assets/logo_app_search.svg'; +import logoAWS from './assets/logo_aws.svg'; +import logoAWSMono from './assets/logo_aws_mono.svg'; import logoBeats from './assets/logo_beats.svg'; import logoBusinessAnalytics from './assets/logo_business_analytics.svg'; import logoCeph from './assets/logo_ceph.svg'; @@ -130,8 +134,8 @@ import logoCouchbase from './assets/logo_couchbase.svg'; import logoDocker from './assets/logo_docker.svg'; import logoDropwizard from './assets/logo_dropwizard.svg'; import logoElastic from './assets/logo_elastic.svg'; -import logoElasticStack from './assets/logo_elastic_stack.svg'; import logoElasticsearch from './assets/logo_elasticsearch.svg'; +import logoElasticStack from './assets/logo_elastic_stack.svg'; import logoEnterpriseSearch from './assets/logo_enterprise_search.svg'; import logoEtcd from './assets/logo_etcd.svg'; import logoGCP from './assets/logo_gcp.svg'; @@ -175,6 +179,7 @@ import memory from './assets/memory.svg'; import merge from './assets/merge.svg'; import metricbeatApp from './assets/app_metricbeat.svg'; import minusInCircle from './assets/minus_in_circle.svg'; +import minusInCircleFilled from './assets/minus_in_circle_filled.svg'; import monitoringApp from './assets/app_monitoring.svg'; import node from './assets/node.svg'; import notebookApp from './assets/app_notebook.svg'; @@ -188,6 +193,7 @@ import pin from './assets/pin.svg'; import pipelineApp from './assets/app_pipeline.svg'; import play from './assets/play.svg'; import plusInCircle from './assets/plus_in_circle.svg'; +import plusInCircleFilled from './assets/plus_in_circle_filled.svg'; import popout from './assets/popout.svg'; import questionInCircle from './assets/question_in_circle.svg'; import refresh from './assets/refresh.svg'; @@ -201,6 +207,7 @@ import securityAnalyticsApp from './assets/app_security_analytics.svg'; import securityApp from './assets/app_security.svg'; import shard from './assets/shard.svg'; import share from './assets/share.svg'; +import sortable from './assets/sortable.svg'; import sortDown from './assets/sort_down.svg'; import sortLeft from './assets/sortLeft.svg'; import sortRight from './assets/sortRight.svg'; @@ -208,6 +215,12 @@ import sortUp from './assets/sort_up.svg'; import spacesApp from './assets/app_spaces.svg'; import sqlApp from './assets/app_sql.svg'; import starEmpty from './assets/star_empty.svg'; +import starEmptySpace from './assets/star_empty_space.svg'; +import starFilled from './assets/star_filled.svg'; +import starFilledSpace from './assets/star_filled_space.svg'; +import starMinusEmpty from './assets/star_minus_empty.svg'; +import starMinusFilled from './assets/star_minus_filled.svg'; +import starPlusEmpty from './assets/starPlusEmpty.svg'; import starPlusFilled from './assets/starPlusFilled.svg'; import stats from './assets/stats.svg'; import stop from './assets/stop.svg'; @@ -240,9 +253,9 @@ import visTable from './assets/vis_table.svg'; import visTagCloud from './assets/vis_tag_cloud.svg'; import visText from './assets/vis_text.svg'; import visTimelion from './assets/vis_timelion.svg'; +import visualizeApp from './assets/app_visualize.svg'; import visVega from './assets/vis_vega.svg'; import visVisualBuilder from './assets/vis_visual_builder.svg'; -import visualizeApp from './assets/app_visualize.svg'; import watchesApp from './assets/app_watches.svg'; import wrench from './assets/wrench.svg'; @@ -288,6 +301,7 @@ const typeToIconMap = { arrowRight, arrowUp, asterisk, + auditbeatApp, beaker, bolt, boxesHorizontal, @@ -297,6 +311,7 @@ const typeToIconMap = { brush, bullseye, calendar, + canvasApp, check, checkInCircleFilled, clock, @@ -312,7 +327,9 @@ const typeToIconMap = { createPopulationJob, createSingleMetricJob, cross, + crossClusterReplicationApp, crosshairs, + crossInACircleFilled, dashboardApp, database, dataVisualizer, @@ -330,9 +347,11 @@ const typeToIconMap = { editorItalic, editorLink, editorOrderedList, + editorRedo, editorStrike, editorTable, editorUnderline, + editorUndo, editorUnorderedList, email, empty, @@ -345,16 +364,20 @@ const typeToIconMap = { faceHappy, faceNeutral, faceSad, + filebeatApp, filter, folderClosed, folderOpen, fullScreen, gear, + gisApp, globe, grab, + grabHorizontal, graphApp, grid, grokApp, + heartbeatApp, heatmap, help, iInCircle, @@ -366,6 +389,7 @@ const typeToIconMap = { indexMapping, indexOpen, indexPatternApp, + indexRollupApp, indexSettings, infraApp, inputOutput, @@ -382,12 +406,12 @@ const typeToIconMap = { lock, lockOpen, loggingApp, - logoAPM, - logoAWS, - logoAWSMono, logoAerospike, logoApache, + logoAPM, logoAppSearch, + logoAWS, + logoAWSMono, logoBeats, logoBusinessAnalytics, logoCeph, @@ -397,8 +421,8 @@ const typeToIconMap = { logoDocker, logoDropwizard, logoElastic, - logoElasticStack, logoElasticsearch, + logoElasticStack, logoEnterpriseSearch, logoEtcd, logoGCP, @@ -440,18 +464,23 @@ const typeToIconMap = { mapMarker, memory, merge, + metricbeatApp, minusInCircle, + minusInCircleFilled, monitoringApp, node, + notebookApp, number, offline, online, + packetbeatApp, pause, pencil, pin, pipelineApp, play, plusInCircle, + plusInCircleFilled, popout, questionInCircle, refresh, @@ -461,15 +490,24 @@ const typeToIconMap = { scale, search, searchProfilerApp, + securityAnalyticsApp, securityApp, shard, share, + sortable, sortDown, sortLeft, sortRight, sortUp, spacesApp, + sqlApp, starEmpty, + starEmptySpace, + starFilled, + starFilledSpace, + starMinusEmpty, + starMinusFilled, + starPlusEmpty, starPlusFilled, stats, stop, @@ -481,6 +519,34 @@ const typeToIconMap = { tear, temperature, timelionApp, + tokenAnnotation, + tokenArray, + tokenBoolean, + tokenClass, + tokenConstant, + tokenElement, + tokenEnum, + tokenEnumMember, + tokenEvent, + tokenException, + tokenField, + tokenFile, + tokenFunction, + tokenInterface, + tokenKey, + tokenMethod, + tokenNull, + tokenNumber, + tokenObject, + tokenOperator, + tokenPackage, + tokenParameter, + tokenProperty, + tokenRepo, + tokenString, + tokenStruct, + tokenSymbol, + tokenVariable, trash, upgradeAssistantApp, user, @@ -507,46 +573,6 @@ const typeToIconMap = { visVisualBuilder, watchesApp, wrench, - auditbeatApp, - canvasApp, - crossClusterReplicationApp, - filebeatApp, - gisApp, - heartbeatApp, - indexRollupApp, - metricbeatApp, - notebookApp, - packetbeatApp, - securityAnalyticsApp, - sqlApp, - tokenClass, - tokenProperty, - tokenEnum, - tokenVariable, - tokenMethod, - tokenAnnotation, - tokenException, - tokenInterface, - tokenParameter, - tokenField, - tokenElement, - tokenFunction, - tokenBoolean, - tokenString, - tokenArray, - tokenNumber, - tokenConstant, - tokenObject, - tokenEvent, - tokenKey, - tokenNull, - tokenStruct, - tokenPackage, - tokenOperator, - tokenEnumMember, - tokenRepo, - tokenSymbol, - tokenFile, }; export const TYPES: IconType[] = keysOf(typeToIconMap); diff --git a/src/components/modal/__snapshots__/confirm_modal.test.js.snap b/src/components/modal/__snapshots__/confirm_modal.test.js.snap index 1eb0ea9fb83..a7f03147a02 100644 --- a/src/components/modal/__snapshots__/confirm_modal.test.js.snap +++ b/src/components/modal/__snapshots__/confirm_modal.test.js.snap @@ -20,18 +20,10 @@ exports[`renders EuiConfirmModal 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - diff --git a/src/components/modal/__snapshots__/modal.test.js.snap b/src/components/modal/__snapshots__/modal.test.js.snap index df1782bfddd..f3ed87c5ede 100644 --- a/src/components/modal/__snapshots__/modal.test.js.snap +++ b/src/components/modal/__snapshots__/modal.test.js.snap @@ -20,18 +20,10 @@ exports[`renders EuiModal 1`] = ` height="16" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - diff --git a/src/components/steps/__snapshots__/step_number.test.js.snap b/src/components/steps/__snapshots__/step_number.test.js.snap index a10762193de..9c60c32c330 100644 --- a/src/components/steps/__snapshots__/step_number.test.js.snap +++ b/src/components/steps/__snapshots__/step_number.test.js.snap @@ -29,6 +29,7 @@ exports[`EuiStepNumber props status complete is rendered 1`] = ` > @@ -45,18 +46,10 @@ exports[`EuiStepNumber props status danger is rendered 1`] = ` title="has errors" viewBox="0 0 16 16" width="16" - xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" > - - - - @@ -91,16 +84,10 @@ exports[`EuiStepNumber props status warning is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - + /> `; diff --git a/src/components/steps/__snapshots__/steps_horizontal.test.js.snap b/src/components/steps/__snapshots__/steps_horizontal.test.js.snap index 960fec12695..a9c8fcec7a6 100644 --- a/src/components/steps/__snapshots__/steps_horizontal.test.js.snap +++ b/src/components/steps/__snapshots__/steps_horizontal.test.js.snap @@ -34,6 +34,7 @@ exports[`EuiStepsHorizontal is rendered 1`] = ` > diff --git a/src/components/steps/_mixins.scss b/src/components/steps/_mixins.scss index e5cdd512c2f..4a90fd845d8 100644 --- a/src/components/steps/_mixins.scss +++ b/src/components/steps/_mixins.scss @@ -7,6 +7,6 @@ text-align: center; color: $euiColorEmptyShade; background-color: $euiColorPrimary; - font-size: $euiFontSize; + font-size: $euiSize; // setting to actual base size will keep it aligned if base font-size changes font-weight: $euiFontWeightMedium; } diff --git a/src/components/toast/__snapshots__/global_toast_list.test.js.snap b/src/components/toast/__snapshots__/global_toast_list.test.js.snap index 4aa698b6e97..d6e2a104763 100644 --- a/src/components/toast/__snapshots__/global_toast_list.test.js.snap +++ b/src/components/toast/__snapshots__/global_toast_list.test.js.snap @@ -39,6 +39,7 @@ exports[`EuiGlobalToastList props toasts is rendered 1`] = ` > - - - - @@ -106,16 +99,10 @@ exports[`EuiGlobalToastList props toasts is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - + /> - - - - diff --git a/src/components/tool_tip/__snapshots__/icon_tip.test.js.snap b/src/components/tool_tip/__snapshots__/icon_tip.test.js.snap index c0b58ff73c5..b678b34dcb2 100644 --- a/src/components/tool_tip/__snapshots__/icon_tip.test.js.snap +++ b/src/components/tool_tip/__snapshots__/icon_tip.test.js.snap @@ -16,10 +16,7 @@ exports[`EuiIconTip is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > - @@ -41,10 +38,7 @@ exports[`EuiIconTip props color is rendered as the icon color 1`] = ` xmlns="http://www.w3.org/2000/svg" > - @@ -66,10 +60,7 @@ exports[`EuiIconTip props size is rendered as the icon size 1`] = ` xmlns="http://www.w3.org/2000/svg" > - @@ -90,16 +81,10 @@ exports[`EuiIconTip props type is rendered as the icon 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - + /> `; From fa6138f5615738be97cd49b3c02dfdcfd4756c30 Mon Sep 17 00:00:00 2001 From: cchaos Date: Fri, 14 Dec 2018 02:03:06 -0500 Subject: [PATCH 2/5] Fixed docs & cl --- CHANGELOG.md | 2 + src-docs/src/views/button/button_with_icon.js | 8 +- src-docs/src/views/icon/icons.js | 276 ++++++++---------- 3 files changed, 125 insertions(+), 161 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 628f000bd20..e2350dfbcd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## [`master`](https://github.com/elastic/eui/tree/master) +- Altered a few icons and added more: `crossInACircleFilled`, `editorRedo`, `editorUndo`, `grabHorizontal`, `minusInCircleFilled`, `plusInCircleFilled`, `sortable`, `starEmptySpace`, `starFilledSpace`, `starFilled`, `starMinusEmpty`, `starMinusFilled`, `starPlusEmpty`, `wrench`, ([#1374](https://github.com/elastic/eui/pull/1374)) + **Bug fixes** - Only style anchor tags in `EuiText` that have no class attribute ([#1373](https://github.com/elastic/eui/pull/1373)) diff --git a/src-docs/src/views/button/button_with_icon.js b/src-docs/src/views/button/button_with_icon.js index 4699860ba3c..bcfe10394dd 100644 --- a/src-docs/src/views/button/button_with_icon.js +++ b/src-docs/src/views/button/button_with_icon.js @@ -12,7 +12,7 @@ export default () => ( window.alert('Button clicked')} - iconType="folderOpen" + iconType="arrowUp" > Primary @@ -21,7 +21,7 @@ export default () => ( window.alert('Button clicked')} > Filled @@ -30,7 +30,7 @@ export default () => ( window.alert('Button clicked')} > @@ -40,7 +40,7 @@ export default () => ( window.alert('Button clicked')} diff --git a/src-docs/src/views/icon/icons.js b/src-docs/src/views/icon/icons.js index 8736b11ac9f..ca190deb8e6 100644 --- a/src-docs/src/views/icon/icons.js +++ b/src-docs/src/views/icon/icons.js @@ -9,206 +9,168 @@ import { } from '../../../../src/components'; const iconTypes = [ - // 'alert', - // 'apmTrace', - // 'apps', - // 'arrowDown', - // 'arrowLeft', - // 'arrowRight', - // 'arrowUp', - // 'asterisk', - // 'beaker', - // 'bolt', - // 'boxesHorizontal', - // 'boxesVertical', - // 'branch', - // 'broom', - // 'brush', - // 'bullseye', - // 'calendar', - // 'check', - // 'checkInCircleFilled', - // 'clock', - // 'compute', - // 'console', - // 'controlsHorizontal', - // 'controlsVertical', - // 'copy', - // 'copyClipboard', - // 'cross', - // 'crosshairs', - // 'database', - // 'document', - // 'dot', - // 'editorAlignCenter', - // 'editorAlignLeft', - // 'editorAlignRight', - // 'editorBold', - // 'editorCodeBlock', - // 'editorComment', - // 'editorHeading', - // 'editorItalic', - // 'editorLink', - // 'editorStrike', - // 'editorTable', - // 'editorUnderline', - // 'editorOrderedList', - // 'editorUnorderedList', - // 'email', - // 'empty', - // 'exit', - // 'expand', - // 'exportAction', - // 'eye', - // 'eyeClosed', - // 'faceHappy', - // 'faceNeutral', - // 'faceSad', - // 'filter', - // 'folderClosed', - // 'folderOpen', - // 'fullScreen', - // 'gear', - // 'globe', - // 'grab', - // 'grid', - // 'heatmap', - // 'help', - // 'iInCircle', - // 'importAction', - // 'indexClose', - // 'indexEdit', - // 'indexFlush', - // 'indexMapping', - // 'indexOpen', - // 'indexSettings', - // 'inspect', - // 'invert', - // 'inputOutput', - // 'kqlField', - // 'kqlOperand', - // 'kqlValue', - // 'kqlFunction', - // 'kqlSelector', - // 'link', - // 'list', - // 'listAdd', - // 'lock', - // 'lockOpen', - // 'logstashFilter', - // 'logstashIf', - // 'logstashInput', - // 'logstashOutput', - // 'logstashQueue', - // 'mapMarker', - // 'merge', - // 'memory', - // 'minusInCircle', - // 'node', - // 'number', - // 'offline', - // 'online', - // 'pause', - // 'pencil', - // 'pin', - // 'play', - // 'plusInCircle', - // 'popout', - // 'questionInCircle', - // 'refresh', - // 'save', - // 'scale', - // 'search', - // 'shard', - // 'share', - // 'sortDown', - // 'sortLeft', - // 'sortRight', - // 'sortUp', - // 'starEmpty', - // 'starPlusFilled', - // 'stats', - // 'stop', - // 'stopFilled', - // 'storage', - // 'string', - // 'temperature', - // 'tableOfContents', - // 'tag', - // 'tear', - // 'trash', - // 'user', - // 'vector', - // 'wrench', - // 'visArea', - // 'visBarHorizontal', - // 'visBarVertical', - // 'visControls', - // 'visGauge', - // 'visGoal', - // 'visHeatmap', - // 'visLine', - // 'visMapCoordinate', - // 'visMapRegion', - // 'visMetric', - // 'visPie', - // 'visTable', - // 'visTagCloud', - // 'visText', - // 'visTimelion', - // 'visVega', - // 'visVisualBuilder' 'alert', + 'apmTrace', + 'apps', + 'arrowDown', + 'arrowLeft', + 'arrowRight', + 'arrowUp', + 'asterisk', + 'beaker', + 'bolt', + 'boxesHorizontal', + 'boxesVertical', 'branch', + 'broom', + 'brush', 'bullseye', + 'calendar', 'check', 'checkInCircleFilled', 'clock', + 'compute', + 'console', 'controlsHorizontal', 'controlsVertical', + 'copy', + 'copyClipboard', 'cross', + 'crosshairs', 'crossInACircleFilled', + 'database', + 'document', + 'dot', + 'editorAlignCenter', + 'editorAlignLeft', + 'editorAlignRight', + 'editorBold', 'editorCodeBlock', + 'editorComment', + 'editorHeading', + 'editorItalic', + 'editorLink', + 'editorOrderedList', 'editorRedo', + 'editorStrike', + 'editorTable', 'editorUnderline', 'editorUndo', + 'editorUnorderedList', + 'email', + 'empty', 'exit', 'expand', + 'exportAction', + 'eye', + 'eyeClosed', + 'faceHappy', + 'faceNeutral', + 'faceSad', + 'filter', 'folderClosed', 'folderOpen', - 'grabHorizontal', + 'fullScreen', + 'gear', + 'globe', 'grab', + 'grabHorizontal', + 'grid', + 'heatmap', + 'help', 'iInCircle', + 'importAction', 'indexClose', + 'indexEdit', + 'indexFlush', + 'indexMapping', 'indexOpen', + 'indexSettings', + 'inputOutput', + 'inspect', + 'invert', + 'kqlField', + 'kqlFunction', + 'kqlOperand', + 'kqlSelector', + 'kqlValue', 'link', - 'listAdd', 'list', - 'minusInCircleFilled', + 'listAdd', + 'lock', + 'lockOpen', + 'logstashFilter', + 'logstashIf', + 'logstashInput', + 'logstashOutput', + 'logstashQueue', + 'mapMarker', + 'memory', + 'merge', 'minusInCircle', + 'minusInCircleFilled', + 'node', + 'number', 'offline', 'online', 'pause', + 'pencil', + 'pin', 'play', - 'plusInCircleFilled', 'plusInCircle', + 'plusInCircleFilled', 'popout', 'questionInCircle', 'refresh', + 'save', 'scale', - 'sortDown', - 'sortUp', + 'search', + 'shard', + 'share', 'sortable', + 'sortDown', 'sortLeft', 'sortRight', - 'starEmptySpace', + 'sortUp', 'starEmpty', - 'starFilledSpace', + 'starEmptySpace', 'starFilled', + 'starFilledSpace', 'starMinusEmpty', 'starMinusFilled', 'starPlusEmpty', 'starPlusFilled', + 'stats', + 'stop', + 'stopFilled', + 'storage', + 'string', + 'tableOfContents', + 'tag', + 'tear', + 'temperature', + 'trash', + 'user', + 'vector', + 'visArea', + 'visBarHorizontal', + 'visBarVertical', + 'visControls', + 'visGauge', + 'visGoal', + 'visHeatmap', + 'visLine', + 'visMapCoordinate', + 'visMapRegion', + 'visMetric', + 'visPie', + 'visTable', + 'visTagCloud', + 'visText', + 'visTimelion', + 'visVega', + 'visVisualBuilder', + 'wrench', 'wrench', ]; From 5ba38a4a66cf76a532da10bc20005a0ead3e6907 Mon Sep 17 00:00:00 2001 From: cchaos Date: Fri, 14 Dec 2018 02:05:20 -0500 Subject: [PATCH 3/5] cl fix --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2350dfbcd7..196850619bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## [`master`](https://github.com/elastic/eui/tree/master) -- Altered a few icons and added more: `crossInACircleFilled`, `editorRedo`, `editorUndo`, `grabHorizontal`, `minusInCircleFilled`, `plusInCircleFilled`, `sortable`, `starEmptySpace`, `starFilledSpace`, `starFilled`, `starMinusEmpty`, `starMinusFilled`, `starPlusEmpty`, `wrench`, ([#1374](https://github.com/elastic/eui/pull/1374)) +- Altered a few icons and added more: `crossInACircleFilled`, `editorRedo`, `editorUndo`, `grabHorizontal`, `minusInCircleFilled`, `plusInCircleFilled`, `sortable`, `starEmptySpace`, `starFilledSpace`, `starFilled`, `starMinusEmpty`, `starMinusFilled`, `starPlusEmpty` ([#1374](https://github.com/elastic/eui/pull/1374)) **Bug fixes** From 01119b11ec03e9f4d234a99d229fbbb0677236a4 Mon Sep 17 00:00:00 2001 From: cchaos Date: Fri, 14 Dec 2018 11:08:51 -0500 Subject: [PATCH 4/5] Added unpin icon --- CHANGELOG.md | 2 +- src-docs/src/views/icon/icons.js | 1 + .../icon/__snapshots__/icon.test.tsx.snap | 15 +++++++++++++++ src/components/icon/assets/unpin.svg | 3 +++ src/components/icon/icon.tsx | 2 ++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 src/components/icon/assets/unpin.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index 196850619bf..f860840ebef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## [`master`](https://github.com/elastic/eui/tree/master) -- Altered a few icons and added more: `crossInACircleFilled`, `editorRedo`, `editorUndo`, `grabHorizontal`, `minusInCircleFilled`, `plusInCircleFilled`, `sortable`, `starEmptySpace`, `starFilledSpace`, `starFilled`, `starMinusEmpty`, `starMinusFilled`, `starPlusEmpty` ([#1374](https://github.com/elastic/eui/pull/1374)) +- Altered a few icons and added more: `crossInACircleFilled`, `editorRedo`, `editorUndo`, `grabHorizontal`, `minusInCircleFilled`, `plusInCircleFilled`, `sortable`, `starEmptySpace`, `starFilledSpace`, `starFilled`, `starMinusEmpty`, `starMinusFilled`, `starPlusEmpty`, `unpin` ([#1374](https://github.com/elastic/eui/pull/1374)) **Bug fixes** diff --git a/src-docs/src/views/icon/icons.js b/src-docs/src/views/icon/icons.js index ca190deb8e6..47e41ac13eb 100644 --- a/src-docs/src/views/icon/icons.js +++ b/src-docs/src/views/icon/icons.js @@ -150,6 +150,7 @@ const iconTypes = [ 'tear', 'temperature', 'trash', + 'unpin', 'user', 'vector', 'visArea', diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index 4637c7e3e53..ac69f2b9d72 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -6006,6 +6006,21 @@ exports[`EuiIcon props type trash is rendered 1`] = ` `; +exports[`EuiIcon props type unpin is rendered 1`] = ` + + + +`; + exports[`EuiIcon props type upgradeAssistantApp is rendered 1`] = ` + + diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index 7ad0b1ddbeb..a1b1b8857c8 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -234,6 +234,7 @@ import temperature from './assets/temperature.svg'; import timelionApp from './assets/app_timelion.svg'; import trash from './assets/trash.svg'; import upgradeAssistantApp from './assets/app_upgrade_assistant.svg'; +import unpin from './assets/unpin.svg'; import user from './assets/user.svg'; import usersRolesApp from './assets/app_users_roles.svg'; import vector from './assets/vector.svg'; @@ -549,6 +550,7 @@ const typeToIconMap = { tokenVariable, trash, upgradeAssistantApp, + unpin, user, usersRolesApp, vector, From 6cbd21de7bb27f142838e5c3febf58c7f7fa0631 Mon Sep 17 00:00:00 2001 From: cchaos Date: Mon, 17 Dec 2018 17:08:46 -0500 Subject: [PATCH 5/5] renamed `unpin` to `pinFilled` --- CHANGELOG.md | 2 +- src-docs/src/views/icon/icons.js | 2 +- .../icon/__snapshots__/icon.test.tsx.snap | 30 +++++++++---------- .../icon/assets/{unpin.svg => pin_filled.svg} | 0 src/components/icon/icon.tsx | 4 +-- 5 files changed, 19 insertions(+), 19 deletions(-) rename src/components/icon/assets/{unpin.svg => pin_filled.svg} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f860840ebef..8b0b232c6e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## [`master`](https://github.com/elastic/eui/tree/master) -- Altered a few icons and added more: `crossInACircleFilled`, `editorRedo`, `editorUndo`, `grabHorizontal`, `minusInCircleFilled`, `plusInCircleFilled`, `sortable`, `starEmptySpace`, `starFilledSpace`, `starFilled`, `starMinusEmpty`, `starMinusFilled`, `starPlusEmpty`, `unpin` ([#1374](https://github.com/elastic/eui/pull/1374)) +- Altered a few icons and added more: `crossInACircleFilled`, `editorRedo`, `editorUndo`, `grabHorizontal`, `minusInCircleFilled`, `plusInCircleFilled`, `sortable`, `starEmptySpace`, `starFilledSpace`, `starFilled`, `starMinusEmpty`, `starMinusFilled`, `starPlusEmpty`, `pinFilled` ([#1374](https://github.com/elastic/eui/pull/1374)) **Bug fixes** diff --git a/src-docs/src/views/icon/icons.js b/src-docs/src/views/icon/icons.js index 47e41ac13eb..80a5f151c32 100644 --- a/src-docs/src/views/icon/icons.js +++ b/src-docs/src/views/icon/icons.js @@ -150,7 +150,7 @@ const iconTypes = [ 'tear', 'temperature', 'trash', - 'unpin', + 'pinFilled', 'user', 'vector', 'visArea', diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index ac69f2b9d72..646cf10336a 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -4804,6 +4804,21 @@ exports[`EuiIcon props type pin is rendered 1`] = ` `; +exports[`EuiIcon props type pinFilled is rendered 1`] = ` + + + +`; + exports[`EuiIcon props type pipelineApp is rendered 1`] = ` `; -exports[`EuiIcon props type unpin is rendered 1`] = ` - - - -`; - exports[`EuiIcon props type upgradeAssistantApp is rendered 1`] = `