mirror of
https://github.com/karl0ss/homepage.git
synced 2025-05-06 15:23:40 +01:00
Tweak: again trying to restore chart sizing in 0.10.x (#4479)
This commit is contained in:
parent
2d91b2b748
commit
94936ed09d
@ -63,3 +63,7 @@ dialog ::-webkit-scrollbar {
|
|||||||
::-webkit-details-marker {
|
::-webkit-details-marker {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.chart + .chart {
|
||||||
|
margin-top: 2em;
|
||||||
|
}
|
||||||
|
@ -8,7 +8,7 @@ class Chart extends PureComponent {
|
|||||||
const { dataPoints, formatter, label } = this.props;
|
const { dataPoints, formatter, label } = this.props;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="absolute -top-1 -left-1 h-[120px] w-[calc(100%+0.5em)] z-0">
|
<div className="absolute -top-10 -left-2 h-[calc(100%+3em)] w-[calc(100%+1em)] z-0">
|
||||||
<div className="overflow-clip z-10 w-full h-full">
|
<div className="overflow-clip z-10 w-full h-full">
|
||||||
<ResponsiveContainer width="100%" height="100%">
|
<ResponsiveContainer width="100%" height="100%">
|
||||||
<AreaChart data={dataPoints}>
|
<AreaChart data={dataPoints}>
|
||||||
|
@ -8,7 +8,7 @@ class ChartDual extends PureComponent {
|
|||||||
const { dataPoints, formatter, stack, label, stackOffset } = this.props;
|
const { dataPoints, formatter, stack, label, stackOffset } = this.props;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="absolute -top-1 -left-1 h-[120px] w-[calc(100%+0.5em)] z-0">
|
<div className="absolute -top-10 -left-2 h-[calc(100%+3em)] w-[calc(100%+1em)] z-0">
|
||||||
<div className="overflow-clip z-10 w-full h-full">
|
<div className="overflow-clip z-10 w-full h-full">
|
||||||
<ResponsiveContainer width="100%" height="100%">
|
<ResponsiveContainer width="100%" height="100%">
|
||||||
<AreaChart data={dataPoints} stackOffset={stackOffset ?? "none"}>
|
<AreaChart data={dataPoints} stackOffset={stackOffset ?? "none"}>
|
||||||
|
@ -18,9 +18,9 @@ export default function Container({ children, widget, error = null, chart = true
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={classNames("service-container", chart ? "chart relative h-[120px]" : "")}>
|
<div className={classNames("service-container", chart ? "chart relative h-[68px]" : "")}>
|
||||||
{children}
|
{children}
|
||||||
<div className={`absolute top-0 right-0 bottom-0 left-0 overflow-clip pointer-events-none ${className}`} />
|
<div className={`absolute -top-10 right-0 bottom-0 left-0 overflow-clip pointer-events-none ${className}`} />
|
||||||
{chart && <div className="h-[68px] overflow-clip" />}
|
{chart && <div className="h-[68px] overflow-clip" />}
|
||||||
{!chart && <div className="h-[16px] overflow-clip" />}
|
{!chart && <div className="h-[16px] overflow-clip" />}
|
||||||
</div>
|
</div>
|
||||||
|
@ -43,7 +43,7 @@ export default function Component({ service }) {
|
|||||||
return (
|
return (
|
||||||
<Container chart={chart}>
|
<Container chart={chart}>
|
||||||
{chart && (
|
{chart && (
|
||||||
<div className="absolute top-0 left-0 right-0 bottom-0">
|
<div className="absolute -top-2 -left-2 -right-2 -bottom-2">
|
||||||
<div
|
<div
|
||||||
style={{
|
style={{
|
||||||
height: `${Math.max(20, fsData.size / fsData.free)}%`,
|
height: `${Math.max(20, fsData.size / fsData.free)}%`,
|
||||||
|
@ -107,8 +107,12 @@ export default function Component({ service }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Container chart={chart} className="bg-gradient-to-br from-theme-500/30 via-theme-600/20 to-theme-700/10">
|
<Container chart={chart}>
|
||||||
<Block position="top-3 right-3">
|
{chart && (
|
||||||
|
<div className="bg-gradient-to-br from-theme-500/30 via-theme-600/20 to-theme-700/10 absolute -top-10 -left-2 -right-2 -bottom-2 h-[calc(100%+3em)] w-[calc(100%+1em)]" />
|
||||||
|
)}
|
||||||
|
|
||||||
|
<Block position="-top-6 right-2">
|
||||||
{quicklookData && quicklookData.cpu_name && chart && (
|
{quicklookData && quicklookData.cpu_name && chart && (
|
||||||
<div className="text-[0.6rem] opacity-50">{quicklookData.cpu_name}</div>
|
<div className="text-[0.6rem] opacity-50">{quicklookData.cpu_name}</div>
|
||||||
)}
|
)}
|
||||||
@ -124,7 +128,7 @@ export default function Component({ service }) {
|
|||||||
</Block>
|
</Block>
|
||||||
|
|
||||||
{chart && (
|
{chart && (
|
||||||
<Block position="bottom-3 left-3">
|
<Block position="bottom-3 left-2">
|
||||||
{systemData && systemData.linux_distro && <div className="text-xs opacity-50">{systemData.linux_distro}</div>}
|
{systemData && systemData.linux_distro && <div className="text-xs opacity-50">{systemData.linux_distro}</div>}
|
||||||
{systemData && systemData.os_version && <div className="text-xs opacity-50">{systemData.os_version}</div>}
|
{systemData && systemData.os_version && <div className="text-xs opacity-50">{systemData.os_version}</div>}
|
||||||
{systemData && systemData.hostname && <div className="text-xs opacity-75">{systemData.hostname}</div>}
|
{systemData && systemData.hostname && <div className="text-xs opacity-75">{systemData.hostname}</div>}
|
||||||
@ -137,7 +141,7 @@ export default function Component({ service }) {
|
|||||||
</Block>
|
</Block>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<Block position="bottom-3 right-3 w-[4rem]">
|
<Block position="bottom-3 right-2 w-[4rem]">
|
||||||
{chart && <CPU quicklookData={quicklookData} className="opacity-50" />}
|
{chart && <CPU quicklookData={quicklookData} className="opacity-50" />}
|
||||||
|
|
||||||
{chart && <Mem quicklookData={quicklookData} className="opacity-50" />}
|
{chart && <Mem quicklookData={quicklookData} className="opacity-50" />}
|
||||||
|
@ -42,10 +42,16 @@ export default function Component({ service }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
data.splice(chart ? 5 : 1);
|
data.splice(chart ? 5 : 1);
|
||||||
|
let headerYPosition = "top-4";
|
||||||
|
let listYPosition = "bottom-4";
|
||||||
|
if (chart) {
|
||||||
|
headerYPosition = "-top-6";
|
||||||
|
listYPosition = "-top-3";
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Container chart={chart}>
|
<Container chart={chart}>
|
||||||
<Block position="top-4 right-3 left-3">
|
<Block position={`${headerYPosition} right-3 left-3`}>
|
||||||
<div className="flex items-center text-xs">
|
<div className="flex items-center text-xs">
|
||||||
<div className="grow" />
|
<div className="grow" />
|
||||||
<div className="w-14 text-right italic">{t("resources.cpu")}</div>
|
<div className="w-14 text-right italic">{t("resources.cpu")}</div>
|
||||||
@ -53,7 +59,7 @@ export default function Component({ service }) {
|
|||||||
</div>
|
</div>
|
||||||
</Block>
|
</Block>
|
||||||
|
|
||||||
<Block position="bottom-4 right-3 left-3">
|
<Block position={`${listYPosition} right-3 left-3`}>
|
||||||
<div className="pointer-events-none text-theme-900 dark:text-theme-200">
|
<div className="pointer-events-none text-theme-900 dark:text-theme-200">
|
||||||
{data.map((item) => (
|
{data.map((item) => (
|
||||||
<div key={item.pid} className="text-[0.75rem] h-[0.8rem]">
|
<div key={item.pid} className="text-[0.75rem] h-[0.8rem]">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user