From 828cd05f18cbabbbbe2147ff3a8f0763308f1481 Mon Sep 17 00:00:00 2001
From: Sergej-Vlasov <37613182+Sergej-Vlasov@users.noreply.github.com>
Date: Thu, 10 Apr 2025 19:27:31 +0100
Subject: [PATCH] ConditionalRendering: Adjust naming and delete button
 alignment (#103677)

adjust naming and delete button alignment
---
 .../conditional-rendering/ConditionalRenderingBase.tsx        | 2 +-
 .../ConditionalRenderingGroupCondition.tsx                    | 4 ++--
 public/locales/en-US/grafana.json                             | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingBase.tsx b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingBase.tsx
index f71e4be541b..d078e68da18 100644
--- a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingBase.tsx
+++ b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingBase.tsx
@@ -100,7 +100,7 @@ function ConditionalRenderingBaseRenderer<T extends ConditionalRenderingBase>({
         )}
       </Stack>
 
-      <Stack direction="row" gap={1} justifyContent="stretch" alignItems="baseline">
+      <Stack direction="row" gap={1} justifyContent="stretch" alignItems="center">
         <Stack flex={1} direction="column" gap={1}>
           {comp}
           {!model.isItemSupported() && (
diff --git a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingGroupCondition.tsx b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingGroupCondition.tsx
index 642c4a22b9b..7f7e098d757 100644
--- a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingGroupCondition.tsx
+++ b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingGroupCondition.tsx
@@ -17,8 +17,8 @@ export const ConditionalRenderingGroupCondition = ({ value, onChange }: Props) =
 
   const options: Array<SelectableValue<GroupConditionCondition>> = useMemo(
     () => [
-      { label: t('dashboard.conditional-rendering.conditions.group.condition.all', 'Match all (AND)'), value: 'and' },
-      { label: t('dashboard.conditional-rendering.conditions.group.condition.any', 'Match any (OR)'), value: 'or' },
+      { label: t('dashboard.conditional-rendering.conditions.group.condition.all', 'Match all'), value: 'and' },
+      { label: t('dashboard.conditional-rendering.conditions.group.condition.any', 'Match any'), value: 'or' },
     ],
     []
   );
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index be613569e0c..de8e8e8e608 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -2672,8 +2672,8 @@
             "variable": "Template variable"
           },
           "condition": {
-            "all": "Match all (AND)",
-            "any": "Match any (OR)",
+            "all": "Match all",
+            "any": "Match any",
             "label": "Match rules"
           },
           "label": "Group",