From 813318de08b212e954a65e2713ddbd81eeb45ae8 Mon Sep 17 00:00:00 2001 From: miukimiu Date: Mon, 15 Jun 2020 18:52:38 +0100 Subject: [PATCH 1/4] Updating elastic logo icon --- src/components/icon/assets/logo_elastic.js | 55 +++++++++++---------- src/components/icon/assets/logo_elastic.svg | 19 ++++--- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/src/components/icon/assets/logo_elastic.js b/src/components/icon/assets/logo_elastic.js index eedd54da93a..8f0f7dae23e 100644 --- a/src/components/icon/assets/logo_elastic.js +++ b/src/components/icon/assets/logo_elastic.js @@ -4,37 +4,40 @@ const EuiIconLogoElastic = ({ title, titleId, ...props }) => ( {title ? {title} : null} - - - - - - - - + + + + + + + ); diff --git a/src/components/icon/assets/logo_elastic.svg b/src/components/icon/assets/logo_elastic.svg index d28a40bf30c..351a7788986 100644 --- a/src/components/icon/assets/logo_elastic.svg +++ b/src/components/icon/assets/logo_elastic.svg @@ -1,10 +1,9 @@ - - - - - - - - - - + + + + + + + + + \ No newline at end of file From 10845df36332fcc160df8de6d8541850e1d7c402 Mon Sep 17 00:00:00 2001 From: miukimiu Date: Mon, 15 Jun 2020 19:22:51 +0100 Subject: [PATCH 2/4] Updating test. Small changes. --- CHANGELOG.md | 1 + .../icon/__snapshots__/icon.test.tsx.snap | 151 ++++++++---------- src/components/icon/assets/logo_elastic.js | 2 +- src/components/icon/assets/logo_elastic.svg | 2 +- 4 files changed, 68 insertions(+), 88 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fa4fa0e41e..382aea44d80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Moved all `EuiHeader` SASS variables to `global_styles` ([#3592](https://github.com/elastic/eui/pull/3592)) - Added `side` prop to `EuiGlobalToastList` for choosing which window side to display toasts ([#3600](https://github.com/elastic/eui/pull/3600)) - Default `titleSize` get's implicitly set to 'm' for `EuiEmptyPrompt` ([#3598](https://github.com/elastic/eui/pull/3598)) +- Updated `logoElastic` to meet brand guidelines ([#2769](https://github.com/elastic/eui/pull/2769)) **Bug fixes** diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index d0b90a80e0e..0f38e36857f 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -3947,6 +3947,7 @@ exports[`EuiIcon props type logoElastic is rendered 1`] = ` `; @@ -7639,7 +7640,7 @@ exports[`EuiIcon props type tokenBinary is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -7692,16 +7693,14 @@ exports[`EuiIcon props type tokenCompletionSuggester is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - + + `; @@ -7753,8 +7752,7 @@ exports[`EuiIcon props type tokenDenseVector is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -7895,8 +7893,7 @@ exports[`EuiIcon props type tokenFlattened is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -7949,7 +7946,7 @@ exports[`EuiIcon props type tokenHistogram is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -8003,7 +8000,7 @@ exports[`EuiIcon props type tokenJoin is rendered 1`] = ` > @@ -8038,16 +8035,14 @@ exports[`EuiIcon props type tokenKeyword is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - + + `; @@ -8249,7 +8244,7 @@ exports[`EuiIcon props type tokenPercolator is rendered 1`] = ` > @@ -8306,7 +8301,7 @@ exports[`EuiIcon props type tokenRankFeature is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -8323,7 +8318,7 @@ exports[`EuiIcon props type tokenRankFeatures is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -8357,19 +8352,14 @@ exports[`EuiIcon props type tokenSearchType is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - - + + `; @@ -8455,7 +8445,7 @@ exports[`EuiIcon props type tokenText is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -8471,20 +8461,9 @@ exports[`EuiIcon props type tokenTokenCount is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - - - + `; diff --git a/src/components/icon/assets/logo_elastic.js b/src/components/icon/assets/logo_elastic.js index 8f0f7dae23e..611e532c2fa 100644 --- a/src/components/icon/assets/logo_elastic.js +++ b/src/components/icon/assets/logo_elastic.js @@ -11,7 +11,7 @@ const EuiIconLogoElastic = ({ title, titleId, ...props }) => ( {...props}> {title ? {title} : null} - + From aacc734f6b2d845121624b41fc3bf9fad3142c16 Mon Sep 17 00:00:00 2001 From: miukimiu Date: Mon, 15 Jun 2020 19:27:20 +0100 Subject: [PATCH 3/4] Changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 382aea44d80..259ae4d28dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ - Moved all `EuiHeader` SASS variables to `global_styles` ([#3592](https://github.com/elastic/eui/pull/3592)) - Added `side` prop to `EuiGlobalToastList` for choosing which window side to display toasts ([#3600](https://github.com/elastic/eui/pull/3600)) - Default `titleSize` get's implicitly set to 'm' for `EuiEmptyPrompt` ([#3598](https://github.com/elastic/eui/pull/3598)) -- Updated `logoElastic` to meet brand guidelines ([#2769](https://github.com/elastic/eui/pull/2769)) +- Updated `logoElastic` to meet brand guidelines ([#3613](https://github.com/elastic/eui/pull/3613)) **Bug fixes** From e44f5bae5ac4b21bb12ad12c4245b90c1570bbfb Mon Sep 17 00:00:00 2001 From: miukimiu Date: Mon, 15 Jun 2020 19:36:41 +0100 Subject: [PATCH 4/4] Tests --- .../icon/__snapshots__/icon.test.tsx.snap | 94 ++++++++++++------- 1 file changed, 58 insertions(+), 36 deletions(-) diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index 0f38e36857f..4cfd06a76a9 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -7640,7 +7640,7 @@ exports[`EuiIcon props type tokenBinary is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -7693,14 +7693,16 @@ exports[`EuiIcon props type tokenCompletionSuggester is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - + + + + `; @@ -7752,7 +7754,8 @@ exports[`EuiIcon props type tokenDenseVector is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -7893,7 +7896,8 @@ exports[`EuiIcon props type tokenFlattened is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -7946,7 +7950,7 @@ exports[`EuiIcon props type tokenHistogram is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -8000,7 +8004,7 @@ exports[`EuiIcon props type tokenJoin is rendered 1`] = ` > @@ -8035,14 +8039,16 @@ exports[`EuiIcon props type tokenKeyword is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - + + + + `; @@ -8244,7 +8250,7 @@ exports[`EuiIcon props type tokenPercolator is rendered 1`] = ` > @@ -8301,7 +8307,7 @@ exports[`EuiIcon props type tokenRankFeature is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -8318,7 +8324,7 @@ exports[`EuiIcon props type tokenRankFeatures is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -8352,14 +8358,19 @@ exports[`EuiIcon props type tokenSearchType is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - + + + + + `; @@ -8445,7 +8456,7 @@ exports[`EuiIcon props type tokenText is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -8461,9 +8472,20 @@ exports[`EuiIcon props type tokenTokenCount is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - + + + + + + `;