From 15802bb2e5cd43d8b98f8c3bf9b0f740e9e33f13 Mon Sep 17 00:00:00 2001 From: Marra Sherrier Date: Mon, 5 Oct 2020 12:59:50 -0400 Subject: [PATCH 1/4] eql icon --- src-docs/src/views/icon/icons.js | 1 + src/components/icon/assets/eql.js | 30 ++++++++++++++++++++++++++++++ src/components/icon/assets/eql.svg | 5 +++++ src/components/icon/icon.tsx | 1 + 4 files changed, 37 insertions(+) create mode 100644 src/components/icon/assets/eql.js create mode 100644 src/components/icon/assets/eql.svg diff --git a/src-docs/src/views/icon/icons.js b/src-docs/src/views/icon/icons.js index d3b7425fb6c..45807009b79 100644 --- a/src-docs/src/views/icon/icons.js +++ b/src-docs/src/views/icon/icons.js @@ -71,6 +71,7 @@ export const iconTypes = [ 'download', 'email', 'empty', + 'eql', 'exit', 'expand', 'expandMini', diff --git a/src/components/icon/assets/eql.js b/src/components/icon/assets/eql.js new file mode 100644 index 00000000000..8452bb116b7 --- /dev/null +++ b/src/components/icon/assets/eql.js @@ -0,0 +1,30 @@ +import React from 'react'; + +const EuiIconEql = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + + + +); + +export const icon = EuiIconEql; diff --git a/src/components/icon/assets/eql.svg b/src/components/icon/assets/eql.svg new file mode 100644 index 00000000000..5a953937639 --- /dev/null +++ b/src/components/icon/assets/eql.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index 27e1f640d35..fcdd207c477 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -134,6 +134,7 @@ const typeToPathMap = { email: 'email', empty: 'empty', emsApp: 'app_ems', + eql: 'eql', exit: 'exit', expand: 'expand', expandMini: 'expandMini', From a8f6136a662b34cbadc070fa7bdfeb1315f0dd54 Mon Sep 17 00:00:00 2001 From: Marra Sherrier Date: Mon, 5 Oct 2020 20:33:00 -0400 Subject: [PATCH 2/4] update --- CHANGELOG.md | 1 + src/components/icon/assets/eql.js | 28 +++++++++------------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27b76c1db44..e048f442d2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## [`master`](https://github.com/elastic/eui/tree/master) +- Added `eql` glyph in `EuiIcon` ([#4110](https://github.com/elastic/eui/pull/4110)) - Added `max-width: 100%` to `EuiKeyPadMenu` to allow it to shrink when its container is smaller than its fixed width ([ #4092](https://github.com/elastic/eui/pull/4092)) - Changed `EuiIcon` test mock to render as `span` instead of `div` ([#4099](https://github.com/elastic/eui/pull/4099)) - Added `scripts/docker-puppeteer` as the new home for test-related Docker images ([#4062](https://github.com/elastic/eui/pull/4062)) diff --git a/src/components/icon/assets/eql.js b/src/components/icon/assets/eql.js index 8452bb116b7..65f8553c59e 100644 --- a/src/components/icon/assets/eql.js +++ b/src/components/icon/assets/eql.js @@ -1,29 +1,19 @@ -import React from 'react'; +import * as React from 'react'; const EuiIconEql = ({ title, titleId, ...props }) => ( {title ? {title} : null} - - - + + + + + + + ); From d3e925527c8010ffe9b05c2789adaedcd8fb2384 Mon Sep 17 00:00:00 2001 From: Caroline Horn <549577+cchaos@users.noreply.github.com> Date: Wed, 11 Nov 2020 11:58:07 -0500 Subject: [PATCH 3/4] Fix CL --- CHANGELOG.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77206909c42..26ec22b64f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -106,11 +106,6 @@ ## [`29.4.0`](https://github.com/elastic/eui/tree/v29.4.0) - Added `childrenBetween` prop to `EuiInMemoryTable` to add content between search bar and table ([#4103](https://github.com/elastic/eui/pull/4103)) ->>>>>>> upstream/master -======= -- Added `eql` glyph in `EuiIcon` ([#4110](https://github.com/elastic/eui/pull/4110)) -- Added `childrenBetween` prop to `EuiInMemoryTable` to add content between search bar and table ([#4103](https://github.com/elastic/eui/pull/4103)) ->>>>>>> f6ac4caca16ffb3f98e656100e3524b2887a4366 - Added `max-width: 100%` to `EuiKeyPadMenu` to allow it to shrink when its container is smaller than its fixed width ([ #4092](https://github.com/elastic/eui/pull/4092)) - Added `key` to `EuiComboBoxOptionOption` to allow duplicate labels ([#4048](https://github.com/elastic/eui/pull/4048)) - Changed `EuiIcon` test mock to render as `span` instead of `div` ([#4099](https://github.com/elastic/eui/pull/4099)) From cb2b275f01e797ff4aa46f18f4504fe8ec97fbe4 Mon Sep 17 00:00:00 2001 From: Marra Sherrier Date: Thu, 12 Nov 2020 10:21:57 -0500 Subject: [PATCH 4/4] updated pixels --- src/components/icon/assets/eql.svg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/icon/assets/eql.svg b/src/components/icon/assets/eql.svg index eee2779159f..7b5380b4d40 100644 --- a/src/components/icon/assets/eql.svg +++ b/src/components/icon/assets/eql.svg @@ -1,4 +1,4 @@ - - - + + +