From 7166a3f28fccca15265360701598b9b750fe41c8 Mon Sep 17 00:00:00 2001 From: Yuliia Naumenko Date: Mon, 30 Mar 2020 14:08:13 -0700 Subject: [PATCH 1/5] Added styles to make combobox list items wider for alerting flyout --- .../builtin_alert_types/threshold/expression.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.scss b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.scss index d0a7039ae24e1..c82844f165892 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.scss +++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.scss @@ -1,3 +1,11 @@ .actAlertVisualization__chart { height: $euiSize * 15; } + +.euiComboBoxOptionsList, +.euiFilterSelectItem, +.ReactVirtualized__List, +.ReactVirtualized__Grid__innerScrollContainer { + width: auto; + min-width: $euiSize * 29; +} From 90aaffcaf08c3378f0d02d00ca345d40ffad0688 Mon Sep 17 00:00:00 2001 From: Yuliia Naumenko Date: Mon, 30 Mar 2020 14:28:21 -0700 Subject: [PATCH 2/5] Fixed width for OF expression popover --- .../builtin_alert_types/threshold/expression.scss | 8 ++------ .../public/common/expression_items/of.tsx | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.scss b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.scss index c82844f165892..00b4d4563b1f7 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.scss +++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.scss @@ -2,10 +2,6 @@ height: $euiSize * 15; } -.euiComboBoxOptionsList, -.euiFilterSelectItem, -.ReactVirtualized__List, -.ReactVirtualized__Grid__innerScrollContainer { - width: auto; - min-width: $euiSize * 29; +.ofAggFieldContainer { + width: 480px; } diff --git a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.tsx b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.tsx index 70aa4be6b7f87..1d62bdce92fd2 100644 --- a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.tsx @@ -108,7 +108,7 @@ export const OfExpression = ({ /> - + 0 && aggField !== undefined} From 1d69b63c2587cff19ae0788bf5f32f57aad6fe4d Mon Sep 17 00:00:00 2001 From: Yuliia Naumenko Date: Mon, 30 Mar 2020 14:55:51 -0700 Subject: [PATCH 3/5] Fixed due to comments --- .../components/builtin_alert_types/threshold/expression.scss | 4 ---- .../public/common/expression_items/of.scss | 3 +++ .../triggers_actions_ui/public/common/expression_items/of.tsx | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.scss diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.scss b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.scss index 00b4d4563b1f7..d0a7039ae24e1 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.scss +++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.scss @@ -1,7 +1,3 @@ .actAlertVisualization__chart { height: $euiSize * 15; } - -.ofAggFieldContainer { - width: 480px; -} diff --git a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.scss b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.scss new file mode 100644 index 0000000000000..4aced6c72d864 --- /dev/null +++ b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.scss @@ -0,0 +1,3 @@ +.actOf__aggFieldContainer { + width: 480px; +} diff --git a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.tsx b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.tsx index 1d62bdce92fd2..d399f6136690b 100644 --- a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.tsx @@ -18,6 +18,7 @@ import { import { builtInAggregationTypes } from '../constants'; import { AggregationType } from '../types'; import { ClosablePopoverTitle } from './components'; +import './of.scss'; interface OfExpressionProps { aggType: string; @@ -108,7 +109,7 @@ export const OfExpression = ({ /> - + 0 && aggField !== undefined} From 2d8352f0695ca18b07af19052ed03bee348bad2b Mon Sep 17 00:00:00 2001 From: Yuliia Naumenko Date: Mon, 30 Mar 2020 15:28:17 -0700 Subject: [PATCH 4/5] Fixed due to comments --- .../triggers_actions_ui/public/common/expression_items/of.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.scss b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.scss index 4aced6c72d864..2cb799808af0d 100644 --- a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.scss +++ b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.scss @@ -1,3 +1,3 @@ .actOf__aggFieldContainer { - width: 480px; + width: $euiSize * 30; } From 5a00e72635481e258f3dc666c4ae2ca07eb9c50c Mon Sep 17 00:00:00 2001 From: Yuliia Naumenko Date: Mon, 30 Mar 2020 16:01:13 -0700 Subject: [PATCH 5/5] Resized --- .../triggers_actions_ui/public/common/expression_items/of.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.scss b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.scss index 2cb799808af0d..6b55a43201d16 100644 --- a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.scss +++ b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/of.scss @@ -1,3 +1,3 @@ .actOf__aggFieldContainer { - width: $euiSize * 30; + width: $euiSize * 29; }