Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

refactor(ds): pad the Drawer body by default, add `flush` for region-owning bodies

Juan Denis7e01e7cc9769
diff --git a/frontend/src/components/dashboard/grid/WidgetEditor.jsx b/frontend/src/components/dashboard/grid/WidgetEditor.jsx
index 5d5b2e45..e5b634ac 100644
--- a/frontend/src/components/dashboard/grid/WidgetEditor.jsx
+++ b/frontend/src/components/dashboard/grid/WidgetEditor.jsx
@@ -274,6 +274,7 @@ export function WidgetEditor({
return (
<Drawer
+ flush
open
onOpenChange={(next) => { if (!next) onClose?.(); }}
title={title}
diff --git a/frontend/src/components/dashboard/grid/WidgetLibrary.jsx b/frontend/src/components/dashboard/grid/WidgetLibrary.jsx
index 112d51f0..506578c3 100644
--- a/frontend/src/components/dashboard/grid/WidgetLibrary.jsx
+++ b/frontend/src/components/dashboard/grid/WidgetLibrary.jsx
@@ -233,6 +233,7 @@ export function WidgetLibrary({ types = [], onAdd, onClose }) {
return (
<Drawer
+ flush
open
onOpenChange={(next) => { if (!next) onClose?.(); }}
title="Add a widget"
diff --git a/frontend/src/components/databases/EngineCatalogDrawer.jsx b/frontend/src/components/databases/EngineCatalogDrawer.jsx
index 8b902340..94c3c5af 100644
--- a/frontend/src/components/databases/EngineCatalogDrawer.jsx
+++ b/frontend/src/components/databases/EngineCatalogDrawer.jsx
@@ -174,6 +174,7 @@ export default function EngineCatalogDrawer({
return (
<Drawer
+ flush
open={open}
onOpenChange={onOpenChange}
title="Add a database engine"
diff --git a/frontend/src/components/databases/EngineInstallDrawer.jsx b/frontend/src/components/databases/EngineInstallDrawer.jsx
index 87a98b86..db911571 100644
--- a/frontend/src/components/databases/EngineInstallDrawer.jsx
+++ b/frontend/src/components/databases/EngineInstallDrawer.jsx
@@ -249,6 +249,7 @@ export default function EngineInstallDrawer({ entry, open, onOpenChange, onInsta
return (
<Drawer
+ flush
open={open}
onOpenChange={(next) => { if (!next) setResult(null); onOpenChange(next); }}
title={result ? `${template.name} is installing` : `Install ${template.name}`}
diff --git a/frontend/src/components/ds/Drawer.jsx b/frontend/src/components/ds/Drawer.jsx
index b5eeb5be..d4130a6d 100644
--- a/frontend/src/components/ds/Drawer.jsx
+++ b/frontend/src/components/ds/Drawer.jsx
@@ -11,10 +11,18 @@ import { cn } from '@/lib/utils';
// …body…
// </Drawer>
//
-// NOTE: `.sk-drawer__body` is the scroll region and carries NO padding — some
-// drawers (log tails, tables, editors) run their content edge-to-edge. Ordinary
-// form/detail bodies must pad themselves, or every field sits flush against the
-// panel edge. Pad the body's own root class, not `.sk-drawer__body`.
+// The body is PADDED by default, to the same 18px inset as the header — a
+// drawer that forgets to pad itself used to render every field flush against
+// the panel edge, and enough of them forgot that the drawers stopped looking
+// like one component. Pass `flush` for bodies that own their own regions
+// (a form with a pinned footer, a two-pane catalog, an editor, a log tail):
+//
+// <Drawer flush …>
+// <form className="sk-formdrawer__form"> ← pads its own scroll region
+// <div className="sk-formdrawer__body">…</div>
+// <footer>…</footer>
+// </form>
+// </Drawer>
export function Drawer({
open,
onOpenChange,
@@ -26,6 +34,8 @@ export function Drawer({
side = 'right',
headerExtra,
className,
+ bodyClassName,
+ flush = false,
children,
}) {
return (
@@ -44,7 +54,9 @@ export function Drawer({
</div>
{headerExtra}
</div>
- <div className="sk-drawer__body">{children}</div>
+ <div className={cn('sk-drawer__body', flush && 'sk-drawer__body--flush', bodyClassName)}>
+ {children}
+ </div>
</SheetContent>
</Sheet>
);
diff --git a/frontend/src/pages/Servers.jsx b/frontend/src/pages/Servers.jsx
index 8c359a64..9dc9ddd2 100644
--- a/frontend/src/pages/Servers.jsx
+++ b/frontend/src/pages/Servers.jsx
@@ -545,6 +545,7 @@ Install-ServerKitAgent -Server "${window.location.origin}" -Token "${registratio
return (
<Drawer
+ flush
open
onOpenChange={(next) => { if (!next) onClose(); }}
title={title}
diff --git a/frontend/src/pages/Templates.jsx b/frontend/src/pages/Templates.jsx
index 2d0c0e1a..75848c2f 100644
--- a/frontend/src/pages/Templates.jsx
+++ b/frontend/src/pages/Templates.jsx
@@ -884,6 +884,7 @@ const InstallModal = ({ template, onClose, onSuccess, renderIcon }) => {
return (
<Drawer
+ flush
open
onOpenChange={(next) => { if (!next) onClose?.(); }}
title={`Deploy ${template.name}`}
diff --git a/frontend/src/pages/WordPress.jsx b/frontend/src/pages/WordPress.jsx
index 6a215e56..95ea19a5 100644
--- a/frontend/src/pages/WordPress.jsx
+++ b/frontend/src/pages/WordPress.jsx
@@ -533,6 +533,7 @@ function WordPress() {
creating a WordPress site and deploying a template feel like one
product rather than two. */}
<Drawer
+ flush
open={showCreateModal}
onOpenChange={(next) => { if (!next && !createLoading) setShowCreateModal(false); }}
title="Create WordPress Site"
diff --git a/frontend/src/styles/components/_design-system.scss b/frontend/src/styles/components/_design-system.scss
index 4e506646..99753c30 100644
--- a/frontend/src/styles/components/_design-system.scss
+++ b/frontend/src/styles/components/_design-system.scss
@@ -555,7 +555,18 @@ $sk-tones: ('accent', 'green', 'cyan', 'amber', 'red', 'violet');
&__ico { width: 32px; height: 32px; border-radius: 9px; display: grid; place-items: center; flex-shrink: 0; background: var(--surface-2); color: var(--text-dim); }
&__title { font-weight: 600; font-size: 14.5px; }
&__sub { font-family: var(--mono); font-size: 11px; color: var(--text-faint); margin-top: 1px; }
- &__body { flex: 1; overflow: auto; min-height: 0; }
+ // Padded by default, to the header's own 18px side inset, so a drawer body
+ // never renders flush against the panel edge just because its author forgot
+ // to pad it. Bodies that own their internal regions (a form with a pinned
+ // footer, a two-pane catalog, an editor, a log tail) opt out with `flush`.
+ &__body {
+ flex: 1;
+ overflow: auto;
+ min-height: 0;
+ padding: 18px 18px 28px;
+
+ &--flush { padding: 0; }
+ }
}
// ------------------------------------------------------------
@@ -629,7 +640,6 @@ $sk-tones: ('accent', 'green', 'cyan', 'amber', 'red', 'violet');
display: flex;
flex-direction: column;
gap: 22px;
- padding: 18px;
&__group { display: flex; flex-direction: column; gap: 10px; }
diff --git a/frontend/src/styles/pages/_cron.scss b/frontend/src/styles/pages/_cron.scss
index 276eb2b2..69b330b8 100644
--- a/frontend/src/styles/pages/_cron.scss
+++ b/frontend/src/styles/pages/_cron.scss
@@ -280,7 +280,7 @@
}
.cron-drawer {
- padding: $space-5 $space-5 $space-8;
+ // Inset comes from .sk-drawer__body (padded by default).
display: flex;
flex-direction: column;
gap: $space-5;
diff --git a/frontend/src/styles/pages/_domains.scss b/frontend/src/styles/pages/_domains.scss
index f6b429c2..9b542769 100644
--- a/frontend/src/styles/pages/_domains.scss
+++ b/frontend/src/styles/pages/_domains.scss
@@ -323,7 +323,7 @@
}
.dom-drawer {
- padding: $space-5 $space-5 $space-8;
+ // Inset comes from .sk-drawer__body (padded by default).
display: flex;
flex-direction: column;
gap: $space-5;
diff --git a/frontend/src/styles/pages/_monitors.scss b/frontend/src/styles/pages/_monitors.scss
index 96db164b..c4dc2359 100644
--- a/frontend/src/styles/pages/_monitors.scss
+++ b/frontend/src/styles/pages/_monitors.scss
@@ -178,7 +178,6 @@
display: flex;
flex-direction: column;
gap: 16px;
- padding: 18px;
}
.mon-form__row {
@@ -466,7 +465,6 @@
display: flex;
flex-direction: column;
gap: 16px;
- padding: 18px;
&__pills { display: flex; gap: 8px; flex-wrap: wrap; }
diff --git a/frontend/src/styles/pages/_telemetry.scss b/frontend/src/styles/pages/_telemetry.scss
index 94221ce6..3fc351e5 100644
--- a/frontend/src/styles/pages/_telemetry.scss
+++ b/frontend/src/styles/pages/_telemetry.scss
@@ -92,7 +92,6 @@
display: flex;
flex-direction: column;
gap: 16px;
- padding: 18px;
&__heading {
margin: 0;