diff --git a/CHANGELOG.md b/CHANGELOG.md index bd7cb918467..e9b3ca7a996 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## [`master`](https://github.com/elastic/eui/tree/master) +- Added 3 new icons — `folderOpen`, `folderClosed`, and `crosshairs` ([#1350](https://github.com/elastic/eui/pull/1350)) - Added `bottomGraphic` prop to `EuiCard` for Kibana home page ([#1338](https://github.com/elastic/eui/pull/1338)) **Bug fixes** diff --git a/src-docs/src/views/icon/icons.js b/src-docs/src/views/icon/icons.js index 9ef86c51ed3..3c3fbda4ca7 100644 --- a/src-docs/src/views/icon/icons.js +++ b/src-docs/src/views/icon/icons.js @@ -36,6 +36,7 @@ const iconTypes = [ 'copy', 'copyClipboard', 'cross', + 'crosshairs', 'database', 'document', 'dot', @@ -64,6 +65,8 @@ const iconTypes = [ 'faceNeutral', 'faceSad', 'filter', + 'folderClosed', + 'folderOpen', 'fullScreen', 'gear', 'globe', diff --git a/src/components/icon/__snapshots__/icon.test.js.snap b/src/components/icon/__snapshots__/icon.test.js.snap index ca9e13ce1d2..06d6cdb6e62 100644 --- a/src/components/icon/__snapshots__/icon.test.js.snap +++ b/src/components/icon/__snapshots__/icon.test.js.snap @@ -1065,6 +1065,21 @@ exports[`EuiIcon props type crossClusterReplicationApp is rendered 1`] = ` `; +exports[`EuiIcon props type crosshairs is rendered 1`] = ` + + + +`; + exports[`EuiIcon props type dashboardApp is rendered 1`] = ` `; +exports[`EuiIcon props type folderClosed is rendered 1`] = ` + + + +`; + +exports[`EuiIcon props type folderOpen is rendered 1`] = ` + + + +`; + exports[`EuiIcon props type fullScreen is rendered 1`] = ` + + diff --git a/src/components/icon/assets/folder_closed.svg b/src/components/icon/assets/folder_closed.svg new file mode 100644 index 00000000000..0d4e61d3d08 --- /dev/null +++ b/src/components/icon/assets/folder_closed.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/folder_open.svg b/src/components/icon/assets/folder_open.svg new file mode 100644 index 00000000000..bfc19ad2349 --- /dev/null +++ b/src/components/icon/assets/folder_open.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/icon.js b/src/components/icon/icon.js index f7baf31a65d..9226ff37413 100644 --- a/src/components/icon/icon.js +++ b/src/components/icon/icon.js @@ -40,6 +40,7 @@ import createPopulationJob from './assets/ml_create_population_job.svg'; 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 dashboardApp from './assets/app_dashboard.svg'; import dataVisualizer from './assets/ml_data_visualizer.svg'; import database from './assets/database.svg'; @@ -74,6 +75,8 @@ import faceNeutral from './assets/faceNeutral.svg'; import faceSad from './assets/face_sad.svg'; import filebeatApp from './assets/app_filebeat.svg'; import filter from './assets/filter.svg'; +import folderClosed from './assets/folder_closed.svg'; +import folderOpen from './assets/folder_open.svg'; import fullScreen from './assets/full_screen.svg'; import gear from './assets/gear.svg'; import gisApp from './assets/app_gis.svg'; @@ -308,6 +311,7 @@ const typeToIconMap = { createPopulationJob, createSingleMetricJob, cross, + crosshairs, dashboardApp, database, dataVisualizer, @@ -341,6 +345,8 @@ const typeToIconMap = { faceNeutral, faceSad, filter, + folderClosed, + folderOpen, fullScreen, gear, globe, diff --git a/src/components/icon/index.d.ts b/src/components/icon/index.d.ts index 2601ec22d0c..5f0ca5355b9 100644 --- a/src/components/icon/index.d.ts +++ b/src/components/icon/index.d.ts @@ -44,6 +44,7 @@ declare module '@elastic/eui' { | 'createPopulationJob' | 'createSingleMetricJob' | 'cross' + | 'crosshairs' | 'dashboardApp' | 'database' | 'dataVisualizer' @@ -76,6 +77,8 @@ declare module '@elastic/eui' { | 'faceNeutral' | 'faceSad' | 'filter' + | 'folderClosed' + | 'folderOpen' | 'fullScreen' | 'gear' | 'globe'