diff --git a/src/components/services/group.jsx b/src/components/services/group.jsx index f25f7ec10..f646f5535 100644 --- a/src/components/services/group.jsx +++ b/src/components/services/group.jsx @@ -15,6 +15,7 @@ export default function ServicesGroup({ disableCollapse, useEqualHeights, groupsInitiallyCollapsed, + isSubgroup, }) { const panel = useRef(); @@ -22,14 +23,22 @@ export default function ServicesGroup({ if (layout?.initiallyCollapsed ?? groupsInitiallyCollapsed) panel.current.style.height = `0`; }, [layout, groupsInitiallyCollapsed]); + let groupMargin = layout?.header === false ? "-my-1" : ""; + if (isSubgroup && layout?.header === false) groupMargin = "-my-3"; + + let groupPadding = layout?.header === false ? "px-1" : "p-1"; + if (isSubgroup) groupPadding = ""; + return (
@@ -96,6 +105,7 @@ export default function ServicesGroup({ disableCollapse={disableCollapse} useEqualHeights={useEqualHeights} groupsInitiallyCollapsed={groupsInitiallyCollapsed} + isSubgroup /> ))}
diff --git a/src/pages/index.jsx b/src/pages/index.jsx index 639aab2e5..78af79992 100644 --- a/src/pages/index.jsx +++ b/src/pages/index.jsx @@ -297,7 +297,6 @@ function Home({ initialSettings }) { disableCollapse={settings.disableCollapse} useEqualHeights={settings.useEqualHeights} groupsInitiallyCollapsed={settings.groupsInitiallyCollapsed} - bookmarksStyle={settings.bookmarksStyle} /> ) : ( +
diff --git a/src/widgets/glances/components/chart_dual.jsx b/src/widgets/glances/components/chart_dual.jsx index 5cc5dea68..5fabe755a 100644 --- a/src/widgets/glances/components/chart_dual.jsx +++ b/src/widgets/glances/components/chart_dual.jsx @@ -8,7 +8,7 @@ class ChartDual extends PureComponent { const { dataPoints, formatter, stack, label, stackOffset } = this.props; return ( -
+
diff --git a/src/widgets/glances/components/container.jsx b/src/widgets/glances/components/container.jsx index 92d7a45d7..01a7e05d5 100644 --- a/src/widgets/glances/components/container.jsx +++ b/src/widgets/glances/components/container.jsx @@ -18,9 +18,9 @@ export default function Container({ children, widget, error = null, chart = true } return ( -
+
{children} -
+
{chart &&
} {!chart &&
}
diff --git a/src/widgets/glances/metrics/fs.jsx b/src/widgets/glances/metrics/fs.jsx index d1ff412c1..3285bd0e5 100644 --- a/src/widgets/glances/metrics/fs.jsx +++ b/src/widgets/glances/metrics/fs.jsx @@ -43,7 +43,7 @@ export default function Component({ service }) { return ( {chart && ( -
+
- + + {chart && ( +
+ )} + + {quicklookData && quicklookData.cpu_name && chart && (
{quicklookData.cpu_name}
)} @@ -124,7 +128,7 @@ export default function Component({ service }) {
{chart && ( - + {systemData && systemData.linux_distro &&
{systemData.linux_distro}
} {systemData && systemData.os_version &&
{systemData.os_version}
} {systemData && systemData.hostname &&
{systemData.hostname}
} @@ -137,7 +141,7 @@ export default function Component({ service }) {
)} - + {chart && } {chart && } diff --git a/src/widgets/glances/metrics/process.jsx b/src/widgets/glances/metrics/process.jsx index b20b4c634..997948f41 100644 --- a/src/widgets/glances/metrics/process.jsx +++ b/src/widgets/glances/metrics/process.jsx @@ -42,10 +42,16 @@ export default function Component({ service }) { } data.splice(chart ? 5 : 1); + let headerYPosition = "top-4"; + let listYPosition = "bottom-4"; + if (chart) { + headerYPosition = "-top-6"; + listYPosition = "-top-3"; + } return ( - +
{t("resources.cpu")}
@@ -53,7 +59,7 @@ export default function Component({ service }) {
- +
{data.map((item) => (