From c2b8e7fcd577492aeb16fbd28e0d278214916772 Mon Sep 17 00:00:00 2001
From: Develer <yeryomin.igor@gmail.com>
Date: Fri, 5 Dec 2025 16:48:15 +0100
Subject: [PATCH] cleanup styles

---
 .../panel-edit/PanelDataPane/AddDataItemMenu.tsx      |  2 +-
 .../panel-edit/PanelDataPane/QueryTransformCard.tsx   |  2 +-
 .../panel-edit/PanelDataPane/QueryTransformList.tsx   |  2 +-
 .../dashboard-scene/panel-edit/PanelOptionsPane.tsx   | 11 +++++++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/AddDataItemMenu.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/AddDataItemMenu.tsx
index 045fd7e214c..f7fe603d8dd 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/AddDataItemMenu.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/AddDataItemMenu.tsx
@@ -135,7 +135,7 @@ export const AddDataItemMenu = memo(
 
 const getStyles = (theme: GrafanaTheme2) => ({
   textButton: css({
-    paddingLeft: 0,
+    paddingLeft: theme.spacing(1),
     fontFamily: theme.typography.fontFamilyMonospace,
   }),
   queryLibraryMenuItem: css({
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformCard.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformCard.tsx
index 96875b5da1d..e3009f90ad3 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformCard.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformCard.tsx
@@ -313,7 +313,7 @@ const getStyles = (theme: GrafanaTheme2, colors: ReturnType<typeof usePanelDataP
       },
     }),
     content: css({
-      padding: theme.spacing(1.5),
+      padding: theme.spacing(0.75) + ' ' + theme.spacing(1),
     }),
     datasourceIcon: css({
       width: '16px',
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformList.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformList.tsx
index fcdf9a195d2..7479fc6bb93 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformList.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformList.tsx
@@ -441,7 +441,7 @@ export const QueryTransformList = memo(
                   )}
                   data-testid="query-transform-list-content"
                 >
-                  <Stack direction="column" gap={3}>
+                  <Stack direction="column" gap={2}>
                     {/* Data Sources Section (Queries + Expressions) */}
                     <Stack direction="column" gap={2}>
                       {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */}
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelOptionsPane.tsx b/public/app/features/dashboard-scene/panel-edit/PanelOptionsPane.tsx
index 3f54971f99d..02d780fe88b 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelOptionsPane.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelOptionsPane.tsx
@@ -158,7 +158,7 @@ function PanelOptionsPaneComponent({ model }: SceneComponentProps<PanelOptionsPa
   }, [pluginId]);
 
   return (
-    <>
+    <div className={styles.wrapper}>
       {!isVizPickerOpen && (
         <>
           <div className={styles.top}>
@@ -235,12 +235,19 @@ function PanelOptionsPaneComponent({ model }: SceneComponentProps<PanelOptionsPa
           showBackButton={config.featureToggles.newVizSuggestions ? hasPickedViz || !isNewPanel : true}
         />
       )}
-    </>
+    </div>
   );
 }
 
 function getStyles(theme: GrafanaTheme2) {
   return {
+    wrapper: css({
+      display: 'contents',
+      '& h6': {
+        fontFamily: theme.typography.fontFamilyMonospace,
+        textTransform: 'uppercase',
+      },
+    }),
     top: css({
       display: 'flex',
       flexDirection: 'row',