Merge branch 'main' into 'fix/edit-mode-scope'

# Conflicts: # client/src/components/layout/Canvas/views/DashboardCanvas.jsx # client/src/components/layout/Sidebar/Sidebar.jsx
2025-07-29 19:22:14 +00:00
parent 80854e4bf3 b68b1500ef
commit a76c869be5
4 changed files with 73 additions and 32 deletions
@@ -106,7 +106,7 @@ export function DashboardCanvas({ view, setView, layout, setLayout, onLayoutChan
        zIndex="dropdown" // zIndex: 1100
 				bg="base200"
 				px={6}
-				py={3}
+				pt={3}
 				align="center"
 				justify="space-between"
      >
@@ -114,10 +114,10 @@ export function DashboardCanvas({ view, setView, layout, setLayout, onLayoutChan
          <Tabs.Trigger value="widget">
            My Dashboard
          </Tabs.Trigger>
-          <Tabs.Trigger value="gas">
+          <Tabs.Trigger value="gas" >
            Gas
          </Tabs.Trigger>
-          <Tabs.Trigger value="seismic">
+          <Tabs.Trigger value="seismic" >
            Seismic
          </Tabs.Trigger>
          <Tabs.Trigger value="remote">