From 86ad31a57df642993fc3bc1710351b98bb46680f Mon Sep 17 00:00:00 2001 From: Benjamin Leonard Date: Fri, 2 May 2025 14:52:34 +0100 Subject: [PATCH 1/3] Tighten full form divider spacing --- app/ui/styles/components/form.css | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/ui/styles/components/form.css b/app/ui/styles/components/form.css index 2e3864ecd2..b4b1e62924 100644 --- a/app/ui/styles/components/form.css +++ b/app/ui/styles/components/form.css @@ -2,7 +2,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * + * * Copyright Oxide Computer Company */ @@ -22,10 +22,7 @@ @apply space-y-6; } -.ox-form.is-side-modal .ox-divider { +.ox-form .ox-divider, +.ox-form .ox-divider:not([hidden]) { @apply my-10; } - -.ox-form:not(.is-side-modal) .ox-divider { - @apply mb-16 mt-20; -} From e5a117c361be97e841d05f0ae253c3d9f159dee1 Mon Sep 17 00:00:00 2001 From: Benjamin Leonard Date: Fri, 2 May 2025 14:52:48 +0100 Subject: [PATCH 2/3] Hardware radio tweaks --- app/forms/instance-create.tsx | 2 -- app/ui/lib/Radio.tsx | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/forms/instance-create.tsx b/app/forms/instance-create.tsx index c0e0f8eadd..ae490aedab 100644 --- a/app/forms/instance-create.tsx +++ b/app/forms/instance-create.tsx @@ -905,13 +905,11 @@ const PRESETS = [ { category: 'general', id: 'general-sm', memory: 16, ncpus: 4 }, { category: 'general', id: 'general-md', memory: 32, ncpus: 8 }, { category: 'general', id: 'general-lg', memory: 64, ncpus: 16 }, - { category: 'general', id: 'general-xl', memory: 128, ncpus: 32 }, { category: 'highCPU', id: 'highCPU-xs', memory: 4, ncpus: 2 }, { category: 'highCPU', id: 'highCPU-sm', memory: 8, ncpus: 4 }, { category: 'highCPU', id: 'highCPU-md', memory: 16, ncpus: 8 }, { category: 'highCPU', id: 'highCPU-lg', memory: 32, ncpus: 16 }, - { category: 'highCPU', id: 'highCPU-xl', memory: 64, ncpus: 32 }, { category: 'highMemory', id: 'highMemory-xs', memory: 16, ncpus: 2 }, { category: 'highMemory', id: 'highMemory-sm', memory: 32, ncpus: 4 }, diff --git a/app/ui/lib/Radio.tsx b/app/ui/lib/Radio.tsx index f914f91ea5..c23caea8c7 100644 --- a/app/ui/lib/Radio.tsx +++ b/app/ui/lib/Radio.tsx @@ -40,7 +40,7 @@ export const Radio = ({ children, className, ...inputProps }: RadioProps) => ( const cardLabelStyles = ` py-2 px-4 text-sans-md border rounded border-default bg-default hover:border-hover - peer-focus:ring-2 peer-focus:ring-accent-secondary w-44 + peer-focus:ring-2 peer-focus:ring-accent-secondary w-44 text-raise children:py-3 children:px-3 children:-mx-4 children:border-secondary first:children:-mt-2 last:children:-mb-2 cursor-pointer From 36204c8d934440af7c7a6c89b3286f4c2ea1ffd9 Mon Sep 17 00:00:00 2001 From: David Crespo Date: Fri, 2 May 2025 15:38:01 -0500 Subject: [PATCH 3/3] switch to ! important --- .oxlintrc.json | 2 +- app/ui/styles/components/form.css | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.oxlintrc.json b/.oxlintrc.json index 18895c7a4c..17ac403c4a 100644 --- a/.oxlintrc.json +++ b/.oxlintrc.json @@ -9,7 +9,7 @@ "oxc" ], "categories": { - "correctness": "error", + "correctness": "error" }, "rules": { // only worry about console.log diff --git a/app/ui/styles/components/form.css b/app/ui/styles/components/form.css index b4b1e62924..98d74b7798 100644 --- a/app/ui/styles/components/form.css +++ b/app/ui/styles/components/form.css @@ -22,7 +22,6 @@ @apply space-y-6; } -.ox-form .ox-divider, -.ox-form .ox-divider:not([hidden]) { - @apply my-10; +.ox-form .ox-divider { + @apply !my-10; /* important overrides space-y-* on .ox-form */ }