From d92a8117e8e11690e81b62b450d3f8126c522567 Mon Sep 17 00:00:00 2001 From: Phyo Lim Date: Wed, 10 Jun 2020 13:45:15 -0400 Subject: [PATCH 1/5] added overwrite for amsterdam euiFilterGroup css --- src/themes/eui-amsterdam/overrides/_filter_group.scss | 4 ++++ src/themes/eui-amsterdam/overrides/_index.scss | 1 + 2 files changed, 5 insertions(+) create mode 100644 src/themes/eui-amsterdam/overrides/_filter_group.scss diff --git a/src/themes/eui-amsterdam/overrides/_filter_group.scss b/src/themes/eui-amsterdam/overrides/_filter_group.scss new file mode 100644 index 00000000000..76a243c13a2 --- /dev/null +++ b/src/themes/eui-amsterdam/overrides/_filter_group.scss @@ -0,0 +1,4 @@ +.euiFilterGroup { + border-radius: $euiBorderRadius; + box-shadow: none; +} diff --git a/src/themes/eui-amsterdam/overrides/_index.scss b/src/themes/eui-amsterdam/overrides/_index.scss index 18d66fc12de..b43bb165853 100644 --- a/src/themes/eui-amsterdam/overrides/_index.scss +++ b/src/themes/eui-amsterdam/overrides/_index.scss @@ -2,6 +2,7 @@ @import 'button_empty'; @import 'button_group'; @import 'call_out'; +@import 'filter_group'; @import 'flyout'; @import 'header'; @import 'image'; From 040aebf7926df701dc145984a212f02a159e43b1 Mon Sep 17 00:00:00 2001 From: Phyo Lim Date: Thu, 11 Jun 2020 11:44:51 -0400 Subject: [PATCH 2/5] remove border-radius from euiButtonEmpty inside filterGroup. box-shadow looks different than form field. @cchaos said it would be fixed when SASS mixins are updated. --- src/themes/eui-amsterdam/overrides/_filter_group.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/themes/eui-amsterdam/overrides/_filter_group.scss b/src/themes/eui-amsterdam/overrides/_filter_group.scss index 76a243c13a2..5e3bc4b70a0 100644 --- a/src/themes/eui-amsterdam/overrides/_filter_group.scss +++ b/src/themes/eui-amsterdam/overrides/_filter_group.scss @@ -1,4 +1,3 @@ -.euiFilterGroup { - border-radius: $euiBorderRadius; - box-shadow: none; +.euiButtonEmpty { + border-radius: 0; } From 5a2006d362cc248b6fe0238ea3f2596d7c0436e4 Mon Sep 17 00:00:00 2001 From: Phyo Lim Date: Thu, 11 Jun 2020 14:41:23 -0400 Subject: [PATCH 3/5] target EuiFilterButton EuiButtonEmpty remove border radius --- CHANGELOG.md | 2 +- src/themes/eui-amsterdam/overrides/_filter_group.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64e0533d79a..7bb1f84ad1d 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)) **Bug fixes** - +- Set `border-radius` to `0` for buttons inside `EuiFilterGroup` - Added `display` prop to `EuiDataGridColumnSortingDraggable` to pass` displayAsText` prop correctly to the column sorting popover.([#3574](https://github.com/elastic/eui/pull/3574)) - Fixed `EuiCodeBlockImpl` testenv mock pass-through of `data-test-subj` attribute ([#3560](https://github.com/elastic/eui/pull/3560)) - Fixed DOM element creation issues in `EuiOverlayMask` by using lifecycle methods ([#3555](https://github.com/elastic/eui/pull/3555)) diff --git a/src/themes/eui-amsterdam/overrides/_filter_group.scss b/src/themes/eui-amsterdam/overrides/_filter_group.scss index 5e3bc4b70a0..a596b8e07ab 100644 --- a/src/themes/eui-amsterdam/overrides/_filter_group.scss +++ b/src/themes/eui-amsterdam/overrides/_filter_group.scss @@ -1,3 +1,3 @@ -.euiButtonEmpty { +.euiFilterButton.euiButtonEmpty { border-radius: 0; } From 10d791103b0a6118bb8c545f78a0999a958be166 Mon Sep 17 00:00:00 2001 From: Caroline Horn <549577+cchaos@users.noreply.github.com> Date: Thu, 11 Jun 2020 14:49:52 -0400 Subject: [PATCH 4/5] Fixed CL (moved to Amsterdam section and added link to PR) --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bb1f84ad1d..d7ec1dc2c04 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)) **Bug fixes** -- Set `border-radius` to `0` for buttons inside `EuiFilterGroup` + - Added `display` prop to `EuiDataGridColumnSortingDraggable` to pass` displayAsText` prop correctly to the column sorting popover.([#3574](https://github.com/elastic/eui/pull/3574)) - Fixed `EuiCodeBlockImpl` testenv mock pass-through of `data-test-subj` attribute ([#3560](https://github.com/elastic/eui/pull/3560)) - Fixed DOM element creation issues in `EuiOverlayMask` by using lifecycle methods ([#3555](https://github.com/elastic/eui/pull/3555)) @@ -25,6 +25,7 @@ - Updated `EuiCallout` by removing left border, adding border radius and increasing font weight on titles ([#3557](https://github.com/elastic/eui/pull/3557/)) - Updated `EuiHeaderBreadcrumbs` style to be more prominent ([#3578](https://github.com/elastic/eui/pull/3578/)) +- Fixed `EuiFilterGroup` `border-radius` ([#3591](https://github.com/elastic/eui/pull/3591/)) ## [`25.0.0`](https://github.com/elastic/eui/tree/v25.0.0) From e4449d1c1236aa961a59390bad8891aa7b6a0d3e Mon Sep 17 00:00:00 2001 From: Phyo Lim <42676669+phylim@users.noreply.github.com> Date: Thu, 11 Jun 2020 15:51:00 -0400 Subject: [PATCH 5/5] Update src/themes/eui-amsterdam/overrides/_filter_group.scss Co-authored-by: Caroline Horn <549577+cchaos@users.noreply.github.com> --- src/themes/eui-amsterdam/overrides/_filter_group.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/themes/eui-amsterdam/overrides/_filter_group.scss b/src/themes/eui-amsterdam/overrides/_filter_group.scss index a596b8e07ab..5e94f59ad5a 100644 --- a/src/themes/eui-amsterdam/overrides/_filter_group.scss +++ b/src/themes/eui-amsterdam/overrides/_filter_group.scss @@ -1,3 +1,3 @@ -.euiFilterButton.euiButtonEmpty { +.euiFilterButton { border-radius: 0; }