Skip to content

Modern Docker Management, Designed for Everyone

refactor: frontend ui cleanup and fixes (#2515)

Kyle Mendell365b7380e9cd
diff --git a/backend/internal/bootstrap/router_bootstrap.go b/backend/internal/bootstrap/router_bootstrap.go
index 3635d94e7..d6d22c55d 100644
--- a/backend/internal/bootstrap/router_bootstrap.go
+++ b/backend/internal/bootstrap/router_bootstrap.go
@@ -36,7 +36,6 @@ var loggerSkipPatterns = []string{
"GET /img",
"GET /api/fonts/sans",
"GET /api/fonts/mono",
- "GET /api/fonts/serif",
"GET /api/health",
"HEAD /api/health",
}
diff --git a/backend/internal/huma/handlers/fonts.go b/backend/internal/huma/handlers/fonts.go
index 5a97092a7..137ae7500 100644
--- a/backend/internal/huma/handlers/fonts.go
+++ b/backend/internal/huma/handlers/fonts.go
@@ -32,7 +32,7 @@ func RegisterFonts(api huma.API, fontService *services.FontService) {
Method: http.MethodGet,
Path: "/fonts/sans",
Summary: "Get sans-serif font",
- Description: "Get the application sans-serif font (Geist)",
+ Description: "Get the application sans-serif font (Mona Sans)",
Tags: []string{"Fonts"},
Security: []map[string][]string{}, // Public endpoint
}, h.GetSansFont)
@@ -42,20 +42,10 @@ func RegisterFonts(api huma.API, fontService *services.FontService) {
Method: http.MethodGet,
Path: "/fonts/mono",
Summary: "Get monospace font",
- Description: "Get the application monospace font (Geist Mono)",
+ Description: "Get the application monospace font (Mona Sans Mono)",
Tags: []string{"Fonts"},
Security: []map[string][]string{}, // Public endpoint
}, h.GetMonoFont)
-
- huma.Register(api, huma.Operation{
- OperationID: "get-serif-font",
- Method: http.MethodGet,
- Path: "/fonts/serif",
- Summary: "Get serif font",
- Description: "Get the application serif font (Calistoga)",
- Tags: []string{"Fonts"},
- Security: []map[string][]string{}, // Public endpoint
- }, h.GetSerifFont)
}
// GetSansFont returns the sans-serif font.
@@ -86,20 +76,6 @@ func (h *FontsHandler) GetMonoFont(ctx context.Context, input *struct{}) (*GetFo
return h.createFontResponse(data, mimeType), nil
}
-// GetSerifFont returns the serif font.
-func (h *FontsHandler) GetSerifFont(ctx context.Context, input *struct{}) (*GetFontOutput, error) {
- if h.fontService == nil {
- return nil, huma.Error500InternalServerError("service not available")
- }
-
- data, mimeType, err := h.fontService.GetSerifFont()
- if err != nil {
- return nil, huma.Error404NotFound("font not found")
- }
-
- return h.createFontResponse(data, mimeType), nil
-}
-
func (h *FontsHandler) createFontResponse(data []byte, mimeType string) *GetFontOutput {
// Cache for 1 year, immutable
cacheControl := "public, max-age=31536000, immutable"
diff --git a/backend/internal/huma/huma_test.go b/backend/internal/huma/huma_test.go
index 690a1d79c..2f8edee48 100644
--- a/backend/internal/huma/huma_test.go
+++ b/backend/internal/huma/huma_test.go
@@ -120,7 +120,6 @@ func TestSetupAPIForSpec_PublicRoutesOverrideSecurity(t *testing.T) {
{path: "/app-version", method: "GET"},
{path: "/fonts/sans", method: "GET"},
{path: "/fonts/mono", method: "GET"},
- {path: "/fonts/serif", method: "GET"},
}
for _, testCase := range testCases {
diff --git a/backend/internal/services/font_service.go b/backend/internal/services/font_service.go
index 27f44e2cd..547bfe4e2 100644
--- a/backend/internal/services/font_service.go
+++ b/backend/internal/services/font_service.go
@@ -21,15 +21,11 @@ func NewFontService(embeddedFS embed.FS) *FontService {
}
func (s *FontService) GetSansFont() ([]byte, string, error) {
- return s.GetFont("Geist/geist.woff2")
+ return s.GetFont("Mona/MonaSans.woff2")
}
func (s *FontService) GetMonoFont() ([]byte, string, error) {
- return s.GetFont("Geist/geist-mono.woff2")
-}
-
-func (s *FontService) GetSerifFont() ([]byte, string, error) {
- return s.GetFont("Calistoga/Calistoga-Regular.woff2")
+ return s.GetFont("Mona/MonaSansMono.woff2")
}
func (s *FontService) GetFont(fontPath string) ([]byte, string, error) {
diff --git a/backend/resources/fonts/Calistoga/Calistoga-Regular.woff2 b/backend/resources/fonts/Calistoga/Calistoga-Regular.woff2
deleted file mode 100644
index a3b8b16b2..000000000
Binary files a/backend/resources/fonts/Calistoga/Calistoga-Regular.woff2 and /dev/null differ
diff --git a/backend/resources/fonts/Geist/geist-mono.woff2 b/backend/resources/fonts/Geist/geist-mono.woff2
deleted file mode 100644
index 68eeb7f4b..000000000
Binary files a/backend/resources/fonts/Geist/geist-mono.woff2 and /dev/null differ
diff --git a/backend/resources/fonts/Geist/geist.woff2 b/backend/resources/fonts/Geist/geist.woff2
deleted file mode 100644
index 445e0e55c..000000000
Binary files a/backend/resources/fonts/Geist/geist.woff2 and /dev/null differ
diff --git a/backend/resources/fonts/Mona/MonaSans.woff2 b/backend/resources/fonts/Mona/MonaSans.woff2
new file mode 100644
index 000000000..904b96b4b
Binary files /dev/null and b/backend/resources/fonts/Mona/MonaSans.woff2 differ
diff --git a/backend/resources/fonts/Mona/MonaSansMono.woff2 b/backend/resources/fonts/Mona/MonaSansMono.woff2
new file mode 100644
index 000000000..2cf264bf2
Binary files /dev/null and b/backend/resources/fonts/Mona/MonaSansMono.woff2 differ
diff --git a/cli/internal/types/endpoints.go b/cli/internal/types/endpoints.go
index f7268d5f3..91d8f1418 100644
--- a/cli/internal/types/endpoints.go
+++ b/cli/internal/types/endpoints.go
@@ -144,7 +144,6 @@ type ArcaneApiEndpoints struct {
AppImagesProfileEndpoint string
FontsMonoEndpoint string
FontsSansEndpoint string
- FontsSerifEndpoint string
// Customization
CustomizeCategoriesEndpoint string
@@ -308,7 +307,6 @@ var Endpoints = ArcaneApiEndpoints{ //nolint:gosec // static endpoint paths; aut
AppImagesProfileEndpoint: "/api/app-images/profile",
FontsMonoEndpoint: "/api/fonts/mono",
FontsSansEndpoint: "/api/fonts/sans",
- FontsSerifEndpoint: "/api/fonts/serif",
// Customization
CustomizeCategoriesEndpoint: "/api/customize/categories",
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d869e63e0..f8e7ada2d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -35,14 +35,15 @@ ARG BUILD_TIME="unknown"
WORKDIR /build
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl git tzdata jq \
-&& apt-get clean && rm -rf /var/lib/apt/lists/*
+ && apt-get clean && rm -rf /var/lib/apt/lists/*
COPY go.work ./
COPY types ./types
COPY cli ./cli
COPY backend/go.mod backend/go.sum ./backend/
WORKDIR /build/backend
-RUN --mount=type=cache,target=/go/pkg/mod go mod download
+RUN --mount=type=cache,target=/go/pkg/mod \
+ go mod download
COPY backend ./
COPY .arcane.json ../arcane.json
@@ -98,4 +99,4 @@ VOLUME ["/app/data"]
LABEL com.getarcaneapp.arcane="true"
-CMD ["./arcane"]
+CMD ["./arcane"]
\ No newline at end of file
diff --git a/docker/Dockerfile-agent b/docker/Dockerfile-agent
index 73f0231b7..ce1e0584a 100644
--- a/docker/Dockerfile-agent
+++ b/docker/Dockerfile-agent
@@ -12,14 +12,15 @@ ARG BUILD_TIME="unknown"
WORKDIR /build
RUN apt-get update && apt-get install -y --no-install-recommends git ca-certificates tzdata curl jq \
-&& apt-get clean && rm -rf /var/lib/apt/lists/*
+ && apt-get clean && rm -rf /var/lib/apt/lists/*
COPY go.work ./
COPY types ./types
COPY cli ./cli
COPY backend/go.mod backend/go.sum ./backend/
WORKDIR /build/backend
-RUN --mount=type=cache,target=/go/pkg/mod go mod download
+RUN --mount=type=cache,target=/go/pkg/mod \
+ go mod download
COPY backend ./
COPY .arcane.json ../arcane.json
@@ -77,4 +78,4 @@ VOLUME ["/app/data"]
LABEL com.getarcaneapp.arcane.agent="true"
-CMD ["./arcane-agent"]
+CMD ["./arcane-agent"]
\ No newline at end of file
diff --git a/docker/next-builds/Dockerfile-next-distroless b/docker/next-builds/Dockerfile-next-distroless
index 78714607b..6a8264ac0 100644
--- a/docker/next-builds/Dockerfile-next-distroless
+++ b/docker/next-builds/Dockerfile-next-distroless
@@ -14,4 +14,4 @@ ENV PORT=3552
EXPOSE 3552
VOLUME ["/app/data"]
-CMD ["./arcane"]
+CMD ["./arcane"]
\ No newline at end of file
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index aa4cd9969..5cb5d457a 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -2143,6 +2143,14 @@
"notifications_tab_apprise": "Apprise",
"notifications_read_only_title": "Read-only Mode",
"notifications_read_only_description": "Settings are read-only in this environment. Configuration changes are disabled.",
+ "notifications_discord_title": "Discord",
+ "notifications_email_title": "Email",
+ "notifications_telegram_title": "Telegram",
+ "notifications_telegram_description": "Send notifications via Telegram bot",
+ "notifications_ntfy_title": "Ntfy",
+ "notifications_pushover_title": "Pushover",
+ "notifications_gotify_title": "Gotify",
+ "notifications_matrix_title": "Matrix",
"notifications_discord_description": "Send notifications to Discord when container updates are detected",
"notifications_discord_enabled_label": "Enable Discord Notifications",
"notifications_discord_webhook_id_label": "Webhook ID",
diff --git a/frontend/src/app.css b/frontend/src/app.css
index c9f59e21a..296dd55a2 100644
--- a/frontend/src/app.css
+++ b/frontend/src/app.css
@@ -4,27 +4,21 @@
@variant dark (&:where(.dark, .dark *));
@font-face {
- font-family: 'Geist';
+ font-family: 'Mona Sans';
src: url('/api/fonts/sans') format('woff2');
- font-weight: 100 900;
+ font-weight: 200 900;
font-display: swap;
font-style: normal;
}
@font-face {
- font-family: 'Geist Mono';
+ font-family: 'Mona Sans Mono';
src: url('/api/fonts/mono') format('woff2');
- font-weight: 100 900;
+ font-weight: 200 900;
font-display: swap;
font-style: normal;
}
-@font-face {
- font-family: Calistoga;
- font-display: swap;
- src: url('/api/fonts/serif') format('woff2');
-}
-
@layer base {
*,
::after,
@@ -652,9 +646,8 @@
--color-sidebar-ring: var(--sidebar-ring);
--color-surface: var(--surface);
- --font-sans: 'Geist', system-ui, sans-serif;
- --font-mono: 'Geist Mono', monospace;
- --font-serif: Calistoga;
+ --font-sans: 'Mona Sans', system-ui, sans-serif;
+ --font-mono: 'Mona Sans Mono', monospace;
}
@layer base {
diff --git a/frontend/src/lib/components/code-editor/theme.ts b/frontend/src/lib/components/code-editor/theme.ts
index 15e3d23c3..aa281aa12 100644
--- a/frontend/src/lib/components/code-editor/theme.ts
+++ b/frontend/src/lib/components/code-editor/theme.ts
@@ -48,7 +48,7 @@ export const arcaneDarkInit = (options?: Partial<CreateThemeOptions>) => {
gutterActiveForeground: '#c9d1d9',
gutterBorder: 'transparent',
- fontFamily: '"Geist Mono", ui-monospace, SFMono-Regular, Menlo, Consolas, "Liberation Mono", "Courier New", monospace',
+ fontFamily: '"Mona Sans Mono", ui-monospace, SFMono-Regular, Menlo, Consolas, "Liberation Mono", "Courier New", monospace',
fontSize: '13px'
};
@@ -104,7 +104,7 @@ export const arcaneLightInit = (options?: Partial<CreateThemeOptions>) => {
gutterActiveForeground: '#24292f',
gutterBorder: 'transparent',
- fontFamily: '"Geist Mono", ui-monospace, SFMono-Regular, Menlo, Consolas, "Liberation Mono", "Courier New", monospace',
+ fontFamily: '"Mona Sans Mono", ui-monospace, SFMono-Regular, Menlo, Consolas, "Liberation Mono", "Courier New", monospace',
fontSize: '13px'
};
diff --git a/frontend/src/lib/components/dialogs/docker-info-dialog.svelte b/frontend/src/lib/components/dialogs/docker-info-dialog.svelte
index 0233cd96a..1aab50279 100644
--- a/frontend/src/lib/components/dialogs/docker-info-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/docker-info-dialog.svelte
@@ -150,21 +150,21 @@
<div class="rounded-lg border p-3">
<div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{m.common_cpus()}</div>
<div class="flex items-center gap-2">
- <Badge variant="outline" class="text-sm font-bold">{info.NCPU ?? 0}</Badge>
+ <Badge variant="outline" class="text-sm font-semibold">{info.NCPU ?? 0}</Badge>
<span class="text-muted-foreground text-[10px]">cores</span>
</div>
</div>
<div class="rounded-lg border p-3">
<div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{m.docker_info_memory_label()}</div>
- <Badge variant="outline" class="text-sm font-bold">{info.MemTotal ? bytes.format(info.MemTotal) : '-'}</Badge>
+ <Badge variant="outline" class="text-sm font-semibold">{info.MemTotal ? bytes.format(info.MemTotal) : '-'}</Badge>
</div>
<div class="rounded-lg border p-3">
<div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{m.docker_info_goroutines()}</div>
- <Badge variant="outline" class="text-sm font-bold">{info.NGoroutines ?? 0}</Badge>
+ <Badge variant="outline" class="text-sm font-semibold">{info.NGoroutines ?? 0}</Badge>
</div>
<div class="rounded-lg border p-3">
<div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{m.docker_info_file_descriptors()}</div>
- <Badge variant="outline" class="text-sm font-bold">{info.NFd ?? 0}</Badge>
+ <Badge variant="outline" class="text-sm font-semibold">{info.NFd ?? 0}</Badge>
</div>
</div>
</div>
@@ -297,7 +297,7 @@
}}
<div class="rounded-lg border p-3 {colors[color].bg}">
<div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{label}</div>
- <Badge variant="outline" class="{colors[color].badge} rounded-md text-base font-bold tabular-nums">
+ <Badge variant="outline" class="{colors[color].badge} rounded-md text-base font-semibold tabular-nums">
{value}
</Badge>
</div>
diff --git a/frontend/src/lib/components/form/form-input.svelte b/frontend/src/lib/components/form/form-input.svelte
index 1dc3d1e2b..c39782205 100644
--- a/frontend/src/lib/components/form/form-input.svelte
+++ b/frontend/src/lib/components/form/form-input.svelte
@@ -67,7 +67,7 @@
<p class="text-muted-foreground mt-1 text-xs">{helpText}</p>
{/if}
{#if warningText}
- <p class="text-destructive mt-1 text-xs font-bold">{warningText}</p>
+ <p class="text-destructive mt-1 text-xs font-semibold">{warningText}</p>
{/if}
</div>
</div>
diff --git a/frontend/src/lib/components/form/select-with-label.svelte b/frontend/src/lib/components/form/select-with-label.svelte
index f0323b987..e6febe59b 100644
--- a/frontend/src/lib/components/form/select-with-label.svelte
+++ b/frontend/src/lib/components/form/select-with-label.svelte
@@ -32,10 +32,15 @@
const selectedLabel = $derived(options.find((o) => o.value === value)?.label ?? placeholder);
</script>
-<div class="grid gap-2">
- <Label for={id} class="text-sm leading-none font-medium">
- {label}
- </Label>
+<div class="space-y-2">
+ <div>
+ <Label for={id} class="text-sm font-medium">
+ {label}
+ </Label>
+ {#if description}
+ <p class="text-muted-foreground mt-0.5 text-xs">{description}</p>
+ {/if}
+ </div>
<Select.Root type="single" bind:value {name} {disabled} onValueChange={(v) => onValueChange?.(v)}>
<Select.Trigger class="w-full {error ? 'border-destructive' : ''}" {id}>
@@ -73,9 +78,6 @@
</Select.Root>
{#if error}
- <p class="text-destructive text-[0.8rem] font-medium">{error}</p>
- {/if}
- {#if description}
- <p class="text-muted-foreground text-[0.8rem]">{description}</p>
+ <p class="text-destructive text-xs font-medium">{error}</p>
{/if}
</div>
diff --git a/frontend/src/lib/components/form/text-input-with-label.svelte b/frontend/src/lib/components/form/text-input-with-label.svelte
index 653aba0d2..81b12fca1 100644
--- a/frontend/src/lib/components/form/text-input-with-label.svelte
+++ b/frontend/src/lib/components/form/text-input-with-label.svelte
@@ -47,10 +47,15 @@
}
</script>
-<div class="grid gap-2">
- <Label for={id} class="text-sm leading-none font-medium">
- {label}{#if required}<span class="text-destructive ml-0.5">*</span>{/if}
- </Label>
+<div class="space-y-2">
+ <div>
+ <Label for={id} class="text-sm font-medium">
+ {label}{#if required}<span class="text-destructive ml-0.5">*</span>{/if}
+ </Label>
+ {#if description}
+ <p class="text-muted-foreground mt-0.5 text-xs">{description}</p>
+ {/if}
+ </div>
<Input
{id}
@@ -66,12 +71,9 @@
/>
{#if error}
- <p class="text-destructive text-[0.8rem] font-medium">{error}</p>
- {/if}
- {#if description}
- <p class="text-muted-foreground text-[0.8rem]">{description}</p>
+ <p class="text-destructive text-xs font-medium">{error}</p>
{/if}
{#if helpText || reserveHelpTextSpace}
- <p class="text-muted-foreground min-h-[1rem] text-[0.7rem]">{helpText}</p>
+ <p class="text-muted-foreground min-h-[1rem] text-xs">{helpText}</p>
{/if}
</div>
diff --git a/frontend/src/lib/components/locale-picker.svelte b/frontend/src/lib/components/locale-picker.svelte
index 67dbd11e8..c565a8460 100644
--- a/frontend/src/lib/components/locale-picker.svelte
+++ b/frontend/src/lib/components/locale-picker.svelte
@@ -87,13 +87,10 @@
onOpenChange?.(open);
}}
>
- <Select.Trigger
- {id}
- class="text-foreground bg-popover/90 bubble bubble-pill bubble-shadow h-9 w-32 rounded-2xl border text-sm font-medium backdrop-blur-md"
- >
+ <Select.Trigger {id} class="h-9 w-32 text-sm font-medium">
<span class="truncate">{locales[currentLocale]}</span>
</Select.Trigger>
- <Select.Content class="bg-card/60 bubble-shadow max-w-70 min-w-40 rounded-xl backdrop-blur-sm">
+ <Select.Content class="max-w-70 min-w-40">
{#each Object.entries(locales) as [value, label] (value)}
<Select.Item class="text-sm" {value}>{label}</Select.Item>
{/each}
@@ -115,14 +112,10 @@
onOpenChange?.(open);
}}
>
- <Select.Trigger
- {id}
- class="bg-popover/90 bubble bubble-pill bubble-shadow h-9 w-full justify-between rounded-2xl border backdrop-blur-md"
- aria-label={m.common_select_locale()}
- >
+ <Select.Trigger {id} class="w-full" aria-label={m.common_select_locale()}>
<span class="truncate">{locales[currentLocale]}</span>
</Select.Trigger>
- <Select.Content class="bg-card/60 bubble-shadow rounded-xl backdrop-blur-sm">
+ <Select.Content>
{#each Object.entries(locales) as [value, label] (value)}
<Select.Item {value}>{label}</Select.Item>
{/each}
diff --git a/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte b/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte
index 3a5ffcc60..7d7c2a459 100644
--- a/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte
+++ b/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte
@@ -147,7 +147,7 @@
<div class="scrollbar-hide flex-1 overflow-y-auto px-6">
<div class="space-y-8">
<section>
- <h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-bold tracking-widest uppercase">
+ <h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-semibold tracking-widest uppercase">
{m.sidebar_management()}
</h4>
<div class="space-y-2">
@@ -214,7 +214,7 @@
</section>
<section>
- <h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-bold tracking-widest uppercase">
+ <h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-semibold tracking-widest uppercase">
{m.sidebar_resources()}
</h4>
<div class="space-y-2">
@@ -282,7 +282,7 @@
{#if swarmItems.length > 0}
<section>
- <h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-bold tracking-widest uppercase">
+ <h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-semibold tracking-widest uppercase">
{m.swarm_title()}
</h4>
<div class="space-y-2">
@@ -311,7 +311,7 @@
{#if isAdmin}
{#if navigationItems.settingsItems}
<section>
- <h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-bold tracking-widest uppercase">
+ <h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-semibold tracking-widest uppercase">
{m.sidebar_administration()}
</h4>
<div class="space-y-2">
diff --git a/frontend/src/lib/components/settings/settings-row.svelte b/frontend/src/lib/components/settings/settings-row.svelte
index 39e5fb1d0..e72072356 100644
--- a/frontend/src/lib/components/settings/settings-row.svelte
+++ b/frontend/src/lib/components/settings/settings-row.svelte
@@ -1,5 +1,6 @@
<script lang="ts">
import { Label } from '$lib/components/ui/label';
+ import { cn } from '$lib/utils';
import type { Snippet } from 'svelte';
interface Props {
@@ -9,27 +10,50 @@
labelExtra?: Snippet;
children: Snippet;
contentClass?: string;
+ layout?: 'stacked' | 'inline';
}
- let { label, description, helpText, labelExtra, children, contentClass }: Props = $props();
+ let { label, description, helpText, labelExtra, children, contentClass, layout = 'stacked' }: Props = $props();
</script>
-<div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{label}</Label>
- {#if description}
- <p class="text-muted-foreground mt-1 text-sm">{description}</p>
- {/if}
- {#if typeof helpText === 'function'}
- {@render helpText()}
- {:else if helpText}
- <p class="text-muted-foreground mt-2 text-xs">{helpText}</p>
- {/if}
- {#if labelExtra}
- {@render labelExtra()}
- {/if}
+{#if layout === 'inline'}
+ <div class="flex items-start justify-between gap-6">
+ <div class="min-w-0 flex-1">
+ <Label class="text-sm font-medium">{label}</Label>
+ {#if description}
+ <p class="text-muted-foreground mt-0.5 text-xs">{description}</p>
+ {/if}
+ {#if typeof helpText === 'function'}
+ {@render helpText()}
+ {:else if helpText}
+ <p class="text-muted-foreground mt-1 text-xs">{helpText}</p>
+ {/if}
+ {#if labelExtra}
+ {@render labelExtra()}
+ {/if}
+ </div>
+ <div class={cn('shrink-0', contentClass)}>
+ {@render children()}
+ </div>
</div>
- <div class={contentClass}>
- {@render children()}
+{:else}
+ <div class="space-y-2">
+ <div>
+ <Label class="text-sm font-medium">{label}</Label>
+ {#if description}
+ <p class="text-muted-foreground mt-0.5 text-xs">{description}</p>
+ {/if}
+ {#if typeof helpText === 'function'}
+ {@render helpText()}
+ {:else if helpText}
+ <p class="text-muted-foreground mt-1 text-xs">{helpText}</p>
+ {/if}
+ {#if labelExtra}
+ {@render labelExtra()}
+ {/if}
+ </div>
+ <div class={cn('pt-1', contentClass)}>
+ {@render children()}
+ </div>
</div>
-</div>
+{/if}
diff --git a/frontend/src/lib/components/settings/trivy-security-settings.svelte b/frontend/src/lib/components/settings/trivy-security-settings.svelte
index 33dca3ba8..798750f36 100644
--- a/frontend/src/lib/components/settings/trivy-security-settings.svelte
+++ b/frontend/src/lib/components/settings/trivy-security-settings.svelte
@@ -1,6 +1,5 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card/index.js';
- import { Label } from '$lib/components/ui/label';
import { Switch } from '$lib/components/ui/switch/index.js';
import { Textarea } from '$lib/components/ui/textarea/index.js';
import * as Alert from '$lib/components/ui/alert';
@@ -153,22 +152,19 @@
</Card.Title>
</div>
</Card.Header>
- <Card.Content class="space-y-6 lg:p-6 lg:pt-0">
- <SettingsRow
- label={m.security_trivy_image_label()}
- description={m.security_trivy_image_description()}
- helpText={m.security_trivy_image_note()}
- contentClass="max-w-xs"
- >
+ <Card.Content class="divide-border/40 divide-y lg:p-6 lg:pt-0 [&>*]:py-5 [&>*:first-child]:pt-0 [&>*:last-child]:pb-0">
+ <div class="max-w-xl">
<TextInputWithLabel
bind:value={$formInputs.trivyImage.value}
error={$formInputs.trivyImage.error}
disabled={true}
label={m.security_trivy_image_label()}
+ description={m.security_trivy_image_description()}
+ helpText={m.security_trivy_image_note()}
placeholder="ghcr.io/getarcaneapp/tools:latest"
type="text"
/>
- </SettingsRow>
+ </div>
<SettingsRow
label={m.security_trivy_network_label()}
@@ -197,7 +193,6 @@
label={m.security_trivy_security_opts_label()}
description={m.security_trivy_security_opts_description()}
helpText={m.security_trivy_security_opts_help()}
- contentClass="space-y-2"
>
<Textarea
bind:value={$formInputs.trivySecurityOpts.value}
@@ -207,89 +202,77 @@
rows={4}
/>
{#if $formInputs.trivySecurityOpts.error}
- <p class="text-destructive text-sm">{$formInputs.trivySecurityOpts.error}</p>
+ <p class="text-destructive mt-2 text-sm">{$formInputs.trivySecurityOpts.error}</p>
{/if}
</SettingsRow>
<SettingsRow
label={m.security_trivy_privileged_label()}
description={m.security_trivy_privileged_description()}
- helpText={m.security_trivy_privileged_note()}
- contentClass="space-y-3"
+ layout="inline"
>
- <div class="flex items-center gap-2">
- <Switch id="trivyPrivilegedSwitch" bind:checked={$formInputs.trivyPrivileged.value} />
- <Label for="trivyPrivilegedSwitch" class="font-normal">
- {$formInputs.trivyPrivileged.value ? m.common_enabled() : m.common_disabled()}
- </Label>
- </div>
- {#if $formInputs.trivyPrivileged.value}
- <Alert.Root variant="default" class="border-amber-200 bg-amber-50 dark:border-amber-800 dark:bg-amber-950">
- <InfoIcon class="h-4 w-4 text-amber-900 dark:text-amber-100" />
- <Alert.Description class="text-amber-800 dark:text-amber-200">
- {m.security_trivy_privileged_note()}
- </Alert.Description>
- </Alert.Root>
- {/if}
+ <Switch id="trivyPrivilegedSwitch" bind:checked={$formInputs.trivyPrivileged.value} />
</SettingsRow>
+ {#if $formInputs.trivyPrivileged.value}
+ <Alert.Root variant="default" class="border-amber-200 bg-amber-50 dark:border-amber-800 dark:bg-amber-950">
+ <InfoIcon class="h-4 w-4 text-amber-900 dark:text-amber-100" />
+ <Alert.Description class="text-amber-800 dark:text-amber-200">
+ {m.security_trivy_privileged_note()}
+ </Alert.Description>
+ </Alert.Root>
+ {/if}
<SettingsRow
label={m.security_trivy_preserve_cache_on_volume_prune_label()}
description={m.security_trivy_preserve_cache_on_volume_prune_description()}
- helpText={m.security_trivy_preserve_cache_on_volume_prune_note()}
- contentClass="space-y-3"
+ layout="inline"
>
- <div class="flex items-center gap-2">
- <Switch id="trivyPreserveCacheOnVolumePruneSwitch" bind:checked={$formInputs.trivyPreserveCacheOnVolumePrune.value} />
- <Label for="trivyPreserveCacheOnVolumePruneSwitch" class="font-normal">
- {$formInputs.trivyPreserveCacheOnVolumePrune.value ? m.common_enabled() : m.common_disabled()}
- </Label>
- </div>
+ <Switch id="trivyPreserveCacheOnVolumePruneSwitch" bind:checked={$formInputs.trivyPreserveCacheOnVolumePrune.value} />
</SettingsRow>
- <SettingsRow
- label={m.security_trivy_resource_limits_label()}
- description={m.security_trivy_resource_limits_description()}
- helpText={m.security_trivy_resource_limits_note()}
- contentClass="space-y-4"
- >
- <div class="flex items-center gap-2">
+ <div class="space-y-4">
+ <SettingsRow
+ label={m.security_trivy_resource_limits_label()}
+ description={m.security_trivy_resource_limits_description()}
+ layout="inline"
+ >
<Switch
id="trivyResourceLimitsEnabledSwitch"
bind:checked={$formInputs.trivyResourceLimitsEnabled.value}
onCheckedChange={handleTrivyResourceLimitsChange}
/>
- <Label for="trivyResourceLimitsEnabledSwitch" class="font-normal">
- {$formInputs.trivyResourceLimitsEnabled.value ? m.common_enabled() : m.common_disabled()}
- </Label>
- </div>
- <div class="grid gap-4 sm:grid-cols-2">
- <TextInputWithLabel
- bind:value={$formInputs.trivyCpuLimit.value}
- error={$formInputs.trivyCpuLimit.error}
- disabled={!$formInputs.trivyResourceLimitsEnabled.value}
- label={m.security_trivy_cpu_limit_label()}
- helpText={m.security_trivy_cpu_limit_help()}
- type="number"
- />
- <TextInputWithLabel
- bind:value={$formInputs.trivyMemoryLimitMb.value}
- error={$formInputs.trivyMemoryLimitMb.error}
- disabled={!$formInputs.trivyResourceLimitsEnabled.value}
- label={m.security_trivy_memory_limit_label()}
- reserveHelpTextSpace={true}
- type="number"
- />
- </div>
- <div class="max-w-xs pt-2">
- <TextInputWithLabel
- bind:value={$formInputs.trivyConcurrentScanContainers.value}
- error={$formInputs.trivyConcurrentScanContainers.error}
- label={m.security_trivy_concurrent_scan_containers_label()}
- helpText={m.security_trivy_concurrent_scan_containers_help()}
- type="number"
- />
- </div>
- </SettingsRow>
+ </SettingsRow>
+ {#if $formInputs.trivyResourceLimitsEnabled.value}
+ <div class="border-border/60 space-y-4 border-l-2 pl-5">
+ <div class="grid gap-4 sm:grid-cols-2">
+ <TextInputWithLabel
+ bind:value={$formInputs.trivyCpuLimit.value}
+ error={$formInputs.trivyCpuLimit.error}
+ disabled={!$formInputs.trivyResourceLimitsEnabled.value}
+ label={m.security_trivy_cpu_limit_label()}
+ helpText={m.security_trivy_cpu_limit_help()}
+ type="number"
+ />
+ <TextInputWithLabel
+ bind:value={$formInputs.trivyMemoryLimitMb.value}
+ error={$formInputs.trivyMemoryLimitMb.error}
+ disabled={!$formInputs.trivyResourceLimitsEnabled.value}
+ label={m.security_trivy_memory_limit_label()}
+ reserveHelpTextSpace={true}
+ type="number"
+ />
+ </div>
+ <div class="max-w-xs">
+ <TextInputWithLabel
+ bind:value={$formInputs.trivyConcurrentScanContainers.value}
+ error={$formInputs.trivyConcurrentScanContainers.error}
+ label={m.security_trivy_concurrent_scan_containers_label()}
+ helpText={m.security_trivy_concurrent_scan_containers_help()}
+ type="number"
+ />
+ </div>
+ </div>
+ {/if}
+ </div>
</Card.Content>
</Card.Root>
diff --git a/frontend/src/lib/components/stat-card.svelte b/frontend/src/lib/components/stat-card.svelte
index bfe91e232..9c1a465ec 100644
--- a/frontend/src/lib/components/stat-card.svelte
+++ b/frontend/src/lib/components/stat-card.svelte
@@ -30,7 +30,7 @@
<div class={cn('flex items-center gap-1.5 px-1', className)}>
<Icon class={cn('size-3.5 opacity-80', iconColor)} />
<div class="flex items-baseline gap-1">
- <span class="text-sm leading-none font-bold tabular-nums">
+ <span class="text-sm leading-none font-semibold tabular-nums">
{value}
</span>
<span class="text-muted-foreground text-[10px] leading-none font-medium tracking-wider whitespace-nowrap uppercase">
@@ -56,7 +56,7 @@
<p class="text-muted-foreground text-sm font-medium tracking-wide">
{title}
</p>
- <h3 class="text-3xl font-bold tracking-tight tabular-nums">
+ <h3 class="text-3xl font-semibold tracking-tight tabular-nums">
{value}
</h3>
{#if subtitle}
diff --git a/frontend/src/lib/components/terminal/terminal.svelte b/frontend/src/lib/components/terminal/terminal.svelte
index 12638a508..5084f7b6e 100644
--- a/frontend/src/lib/components/terminal/terminal.svelte
+++ b/frontend/src/lib/components/terminal/terminal.svelte
@@ -85,7 +85,7 @@
cursorBlink: true,
cursorStyle: 'underline',
fontSize: 14,
- fontFamily: 'Geist Mono, monospace',
+ fontFamily: 'Mona Sans Mono, monospace',
theme: mode.current === 'dark' ? darkTheme : lightTheme
});
diff --git a/frontend/src/lib/layouts/resource-detail-layout.svelte b/frontend/src/lib/layouts/resource-detail-layout.svelte
index e80c4f312..652aa3924 100644
--- a/frontend/src/lib/layouts/resource-detail-layout.svelte
+++ b/frontend/src/lib/layouts/resource-detail-layout.svelte
@@ -140,7 +140,7 @@
<div class="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
<div class="min-w-0 flex-1 space-y-2">
- <h1 class="text-2xl font-bold tracking-tight break-all sm:text-3xl">{title}</h1>
+ <h1 class="text-2xl font-semibold tracking-tight break-all sm:text-3xl">{title}</h1>
{#if subtitle}
<p class="text-muted-foreground text-sm">{subtitle}</p>
{/if}
diff --git a/frontend/src/lib/layouts/resource-page-layout.svelte b/frontend/src/lib/layouts/resource-page-layout.svelte
index c73d3a702..0c41528fb 100644
--- a/frontend/src/lib/layouts/resource-page-layout.svelte
+++ b/frontend/src/lib/layouts/resource-page-layout.svelte
@@ -54,7 +54,7 @@
</div>
{/if}
<div class="min-w-0">
- <h1 class="text-2xl font-bold tracking-tight sm:text-3xl">{title}</h1>
+ <h1 class="text-2xl font-semibold tracking-tight sm:text-3xl">{title}</h1>
{#if subtitle}
<p class="text-muted-foreground mt-1 text-sm">{subtitle}</p>
{/if}
diff --git a/frontend/src/lib/layouts/settings-page-layout.svelte b/frontend/src/lib/layouts/settings-page-layout.svelte
index 279180f77..d55dd02a5 100644
--- a/frontend/src/lib/layouts/settings-page-layout.svelte
+++ b/frontend/src/lib/layouts/settings-page-layout.svelte
@@ -2,7 +2,6 @@
import type { Snippet } from 'svelte';
import { UiConfigDisabledTag } from '$lib/components/badges/index.js';
import StatCard from '$lib/components/stat-card.svelte';
- import HeaderCard from '$lib/components/header-card.svelte';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import { getContext } from 'svelte';
@@ -49,7 +48,7 @@
</script>
<div class={cn('px-2 py-4 pb-5 sm:px-6 sm:py-6 sm:pb-10 lg:px-8', className)}>
- <HeaderCard>
+ <div class="border-border/50 border-b pb-4 sm:pb-6">
<div class="flex items-center justify-between gap-4">
<div class="flex flex-1 items-center gap-3 sm:gap-4">
{#if Icon}
@@ -60,7 +59,7 @@
</div>
{/if}
<div class="min-w-0">
- <h1 class="text-xl font-bold tracking-tight sm:text-3xl">{title}</h1>
+ <h1 class="text-xl font-semibold tracking-tight sm:text-3xl">{title}</h1>
{#if description}
<p class="text-muted-foreground mt-1 hidden text-sm sm:block sm:text-base">{@html description}</p>
{/if}
@@ -188,7 +187,7 @@
{/if}
</div>
</div>
- </HeaderCard>
+ </div>
<div class="mt-6 sm:mt-8">
{@render mainContent()}
diff --git a/frontend/src/routes/(app)/containers/components/ContainerStats.svelte b/frontend/src/routes/(app)/containers/components/ContainerStats.svelte
index 3173bcc8d..2a04c1ee8 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerStats.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerStats.svelte
@@ -202,7 +202,7 @@
<div class="lg:col-span-2">
<div class="space-y-3">
<div class="flex min-h-[44px] items-start justify-between">
- <span class="text-foreground text-base font-bold">{m.dashboard_meter_cpu()}</span>
+ <span class="text-foreground text-base font-semibold">{m.dashboard_meter_cpu()}</span>
<div class="text-right">
<div class="text-muted-foreground text-sm font-semibold">
{cpuUsagePercent.toFixed(2)}%
@@ -236,7 +236,7 @@
<div class="lg:col-span-2">
<div class="space-y-3">
<div class="flex min-h-[44px] items-start justify-between">
- <span class="text-foreground text-base font-bold">{m.dashboard_meter_memory()}</span>
+ <span class="text-foreground text-base font-semibold">{m.dashboard_meter_memory()}</span>
<div class="text-right">
<div class="text-muted-foreground text-sm font-semibold">
{memoryUsagePercent.toFixed(1)}%
@@ -281,7 +281,7 @@
<div class="text-muted-foreground mb-2 text-xs font-semibold tracking-wide uppercase">
{m.containers_process_count()}
</div>
- <div class="text-foreground text-2xl font-bold">{stats.pids_stats.current}</div>
+ <div class="text-foreground text-2xl font-semibold">{stats.pids_stats.current}</div>
{#if stats.pids_stats.limit && stats.pids_stats.limit < Number.MAX_SAFE_INTEGER}
<div class="text-muted-foreground mt-1 text-xs">
{m.common_limit()}: {stats.pids_stats.limit}
@@ -302,7 +302,7 @@
<div class="text-muted-foreground text-xs font-medium">
{m.containers_network_received()}
</div>
- <div class="text-foreground text-sm font-bold">
+ <div class="text-foreground text-sm font-semibold">
{bytes.format(totalNetworkRx)}
</div>
<div class="text-muted-foreground text-xs">
@@ -314,7 +314,7 @@
<div class="text-muted-foreground text-xs font-medium">
{m.containers_network_transmitted()}
</div>
- <div class="text-foreground text-sm font-bold">
+ <div class="text-foreground text-sm font-semibold">
{bytes.format(totalNetworkTx)}
</div>
<div class="text-muted-foreground text-xs">
@@ -338,7 +338,7 @@
<div class="text-muted-foreground text-xs font-medium">
{m.containers_block_io_read()}
</div>
- <div class="text-foreground text-sm font-bold">
+ <div class="text-foreground text-sm font-semibold">
{bytes.format(blockIoRead)}
</div>
</div>
@@ -346,7 +346,7 @@
<div class="text-muted-foreground text-xs font-medium">
{m.containers_block_io_write()}
</div>
- <div class="text-foreground text-sm font-bold">
+ <div class="text-foreground text-sm font-semibold">
{bytes.format(blockIoWrite)}
</div>
</div>
diff --git a/frontend/src/routes/(app)/customize/+page.svelte b/frontend/src/routes/(app)/customize/+page.svelte
index 7e37964af..efa6d98be 100644
--- a/frontend/src/routes/(app)/customize/+page.svelte
+++ b/frontend/src/routes/(app)/customize/+page.svelte
@@ -121,7 +121,7 @@
<CustomizeIcon class="size-4 sm:size-5" />
</div>
<div class="min-w-0">
- <h1 class="text-3xl font-bold tracking-tight">{m.customize_title()}</h1>
+ <h1 class="text-3xl font-semibold tracking-tight">{m.customize_title()}</h1>
<p class="text-muted-foreground mt-1 text-sm sm:text-base">{m.customize_subtitle()}</p>
</div>
</div>
diff --git a/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte b/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte
index 869cf6037..c9d10d647 100644
--- a/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte
+++ b/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte
@@ -248,7 +248,7 @@
containerClass="size-9 bg-transparent ring-0"
/>
<div class="min-w-0 flex-1">
- <h1 class="text-xl font-bold break-words sm:text-2xl">{template.name}</h1>
+ <h1 class="text-xl font-semibold break-words sm:text-2xl">{template.name}</h1>
{#if template.description}
<p class="text-muted-foreground mt-1.5 text-sm break-words sm:text-base">{template.description}</p>
{/if}
@@ -394,7 +394,7 @@
<div class="min-w-0 flex-1">
<div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{m.compose_services()}</div>
<div class="mt-1">
- <div class="text-2xl font-bold">{services?.length ?? 0}</div>
+ <div class="text-2xl font-semibold">{services?.length ?? 0}</div>
</div>
</div>
</Card.Content>
@@ -410,7 +410,7 @@
{m.common_environment_variables()}
</div>
<div class="mt-1 flex flex-wrap items-baseline gap-2">
- <div class="text-2xl font-bold">{envVars?.length ?? 0}</div>
+ <div class="text-2xl font-semibold">{envVars?.length ?? 0}</div>
{#if envVars?.length}
<div class="text-muted-foreground text-sm">{m.templates_configurable_settings()}</div>
{/if}
diff --git a/frontend/src/routes/(app)/customize/templates/default/+page.svelte b/frontend/src/routes/(app)/customize/templates/default/+page.svelte
index 88c96598f..c964d625e 100644
--- a/frontend/src/routes/(app)/customize/templates/default/+page.svelte
+++ b/frontend/src/routes/(app)/customize/templates/default/+page.svelte
@@ -110,7 +110,7 @@
<div class="flex flex-col justify-between gap-4 sm:flex-row sm:items-center">
<div>
- <h1 class="text-xl font-bold wrap-break-word sm:text-2xl">{m.templates_defaults_title()}</h1>
+ <h1 class="text-xl font-semibold wrap-break-word sm:text-2xl">{m.templates_defaults_title()}</h1>
<p class="text-muted-foreground mt-1.5 text-sm wrap-break-word sm:text-base">
{m.templates_defaults_description()}
</p>
diff --git a/frontend/src/routes/(app)/dashboard/+page.svelte b/frontend/src/routes/(app)/dashboard/+page.svelte
index 6cd23589f..0baa126fa 100644
--- a/frontend/src/routes/(app)/dashboard/+page.svelte
+++ b/frontend/src/routes/(app)/dashboard/+page.svelte
@@ -445,7 +445,7 @@
<div class="relative flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between">
<div class="space-y-1.5">
<p class="text-muted-foreground text-[11px] font-semibold tracking-[0.14em] uppercase">{m.dashboard_title()}</p>
- <h1 class="text-2xl font-bold tracking-tight sm:text-3xl">{currentEnvironmentName}</h1>
+ <h1 class="text-2xl font-semibold tracking-tight sm:text-3xl">{currentEnvironmentName}</h1>
</div>
<QuickActions
diff --git a/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte b/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
index 7e3e33e3a..73e9ce6e5 100644
--- a/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
+++ b/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
@@ -647,7 +647,7 @@
<div class="relative flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between">
<div class="space-y-1.5">
<p class="text-muted-foreground text-[11px] font-semibold tracking-[0.14em] uppercase">{m.dashboard_title()}</p>
- <h1 class="text-2xl font-bold tracking-tight sm:text-3xl">{heroGreeting}</h1>
+ <h1 class="text-2xl font-semibold tracking-tight sm:text-3xl">{heroGreeting}</h1>
</div>
<ArcaneButton
diff --git a/frontend/src/routes/(app)/environments/[id]/+page.svelte b/frontend/src/routes/(app)/environments/[id]/+page.svelte
index 5bc173605..63acaea9a 100644
--- a/frontend/src/routes/(app)/environments/[id]/+page.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/+page.svelte
@@ -6,7 +6,10 @@
import { ActionButtonGroup, type ActionButton } from '$lib/components/action-button-group/index.js';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as AlertDialog from '$lib/components/ui/alert-dialog';
+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
+ import { Switch } from '$lib/components/ui/switch/index.js';
import { CopyButton } from '$lib/components/ui/copy-button';
+ import { cn } from '$lib/utils';
import { goto, invalidateAll } from '$app/navigation';
import { page } from '$app/state';
import { toast } from 'svelte-sonner';
@@ -126,15 +129,6 @@
});
}
- actions.push({
- id: 'refresh',
- action: 'refresh',
- label: m.common_refresh(),
- onclick: refreshEnvironment,
- disabled: isRefreshing,
- loading: isRefreshing
- });
-
return actions;
});
@@ -539,12 +533,41 @@
/>
<div class="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
- <div class="flex-1">
- <h1 class="text-xl font-bold wrap-break-word sm:text-2xl">{environment.name}</h1>
- <p class="text-muted-foreground mt-1.5 text-sm wrap-break-word sm:text-base">{m.environments_page_subtitle()}</p>
+ <div class="flex flex-1 items-start gap-4">
+ <div class="min-w-0 flex-1">
+ <h1 class="text-xl font-semibold wrap-break-word sm:text-2xl">{environment.name}</h1>
+ <p class="text-muted-foreground mt-1.5 text-sm wrap-break-word sm:text-base">{m.environments_page_subtitle()}</p>
+ </div>
+
+ <!-- Enable/Disable indicator -->
+ <div class="border-border/60 bg-card/40 flex shrink-0 items-center gap-2.5 rounded-lg border px-3 py-1.5">
+ <div class="flex items-center gap-2">
+ <div
+ class={cn(
+ 'size-2 rounded-full transition-colors',
+ $formInputs.enabled.value ? 'bg-emerald-500 shadow-[0_0_8px_var(--color-emerald-500)]' : 'bg-muted-foreground/40'
+ )}
+ ></div>
+ <span class="text-sm font-medium">
+ {$formInputs.enabled.value ? m.common_enabled() : m.common_disabled()}
+ </span>
+ </div>
+ {#if environment.id === '0'}
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <Switch id="env-enabled-header" disabled={true} bind:checked={$formInputs.enabled.value} />
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content>
+ <p>{m.environments_local_setting_disabled()}</p>
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+ {:else}
+ <Switch id="env-enabled-header" bind:checked={$formInputs.enabled.value} />
+ {/if}
+ </div>
</div>
- <div class="flex min-w-0 flex-1 flex-col items-start gap-3 sm:items-end">
+ <div class="flex min-w-0 flex-col items-start gap-3 sm:items-end">
<div class="hidden flex-wrap items-center gap-2 self-start sm:flex sm:self-end">
{#if settingsForm.hasChanges}
<span class="text-xs text-orange-600 dark:text-orange-400">{m.environments_unsaved_changes()}</span>
@@ -570,11 +593,15 @@
customLabel={m.common_save()}
loadingLabel={m.common_saving()}
/>
+
+ <ArcaneButton action="refresh" onclick={refreshEnvironment} disabled={isRefreshing} loading={isRefreshing} />
</div>
</div>
</div>
- <ActionButtonGroup buttons={headerActions} class="justify-end" />
+ {#if headerActions.length > 0}
+ <ActionButtonGroup buttons={headerActions} class="justify-end" />
+ {/if}
{#if environment.enabled && settings && isCurrentlyStandby}
<div
diff --git a/frontend/src/routes/(app)/environments/[id]/components/DetailsTab.svelte b/frontend/src/routes/(app)/environments/[id]/components/DetailsTab.svelte
index 3a959dcde..6cb0b5cc4 100644
--- a/frontend/src/routes/(app)/environments/[id]/components/DetailsTab.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/components/DetailsTab.svelte
@@ -3,7 +3,6 @@
import * as Card from '$lib/components/ui/card/index.js';
import Label from '$lib/components/ui/label/label.svelte';
import { Input } from '$lib/components/ui/input/index.js';
- import { Switch } from '$lib/components/ui/switch/index.js';
import { Badge } from '$lib/components/ui/badge/index.js';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
@@ -206,25 +205,6 @@
<p class="text-muted-foreground mt-1.5 text-xs">{m.environments_api_url_help()}</p>
</div>
- <div class="flex items-center justify-between rounded-lg border p-4">
- <div class="space-y-0.5">
- <Label for="env-enabled" class="text-sm font-medium">{m.common_enabled()}</Label>
- <div class="text-muted-foreground text-xs">{m.environments_enable_disable_description()}</div>
- </div>
- {#if environment.id === '0'}
- <ArcaneTooltip.Root>
- <ArcaneTooltip.Trigger>
- <Switch id="env-enabled" disabled={true} bind:checked={$formInputs.enabled.value} />
- </ArcaneTooltip.Trigger>
- <ArcaneTooltip.Content>
- <p>{m.environments_local_setting_disabled()}</p>
- </ArcaneTooltip.Content>
- </ArcaneTooltip.Root>
- {:else}
- <Switch id="env-enabled" bind:checked={$formInputs.enabled.value} />
- {/if}
- </div>
-
<div class="grid grid-cols-2 gap-4 rounded-lg border p-4">
<div>
<Label class="text-muted-foreground text-xs font-medium">{m.environments_environment_id_label()}</Label>
diff --git a/frontend/src/routes/(app)/images/builds/+page.svelte b/frontend/src/routes/(app)/images/builds/+page.svelte
index 20b1045cb..42487bd44 100644
--- a/frontend/src/routes/(app)/images/builds/+page.svelte
+++ b/frontend/src/routes/(app)/images/builds/+page.svelte
@@ -1390,10 +1390,10 @@
{#snippet headerInfo()}
<div class="flex flex-col gap-1">
{#if mainTab === 'history'}
- <h1 class="text-2xl font-bold tracking-tight">{m.builds()}</h1>
+ <h1 class="text-2xl font-semibold tracking-tight">{m.builds()}</h1>
<p class="text-muted-foreground text-sm">{m.build_output()}</p>
{:else}
- <h1 class="text-2xl font-bold tracking-tight">{m.manual_build_workspace()}</h1>
+ <h1 class="text-2xl font-semibold tracking-tight">{m.manual_build_workspace()}</h1>
<p class="text-muted-foreground text-sm">{m.manual_build_workspace_subtitle()}</p>
{/if}
</div>
diff --git a/frontend/src/routes/(app)/settings/+page.svelte b/frontend/src/routes/(app)/settings/+page.svelte
index 2c27cc038..6ec8015dd 100644
--- a/frontend/src/routes/(app)/settings/+page.svelte
+++ b/frontend/src/routes/(app)/settings/+page.svelte
@@ -137,7 +137,7 @@
<SettingsIcon class="size-4 sm:size-5" />
</div>
<div class="min-w-0">
- <h1 class="text-3xl font-bold tracking-tight">{m.sidebar_settings()}</h1>
+ <h1 class="text-3xl font-semibold tracking-tight">{m.sidebar_settings()}</h1>
<p class="text-muted-foreground mt-1 text-sm sm:text-base">{m.settings_subtitle()}</p>
</div>
</div>
diff --git a/frontend/src/routes/(app)/settings/appearance/+page.svelte b/frontend/src/routes/(app)/settings/appearance/+page.svelte
index de52fd468..2bc40620f 100644
--- a/frontend/src/routes/(app)/settings/appearance/+page.svelte
+++ b/frontend/src/routes/(app)/settings/appearance/+page.svelte
@@ -9,8 +9,6 @@
import { Switch } from '$lib/components/ui/switch/index.js';
import { useSidebar } from '$lib/components/ui/sidebar/context.svelte.js';
import { createSettingsForm } from '$lib/utils/settings-form.util';
- import { Separator } from '$lib/components/ui/separator';
- import { Label } from '$lib/components/ui/label';
import SettingsRow from '$lib/components/settings/settings-row.svelte';
import LocalePicker from '$lib/components/locale-picker.svelte';
import AccentColorPicker from '$lib/components/accent-color/accent-color-picker.svelte';
@@ -19,8 +17,8 @@
import { APPLICATION_THEME_VALUES, applyApplicationTheme } from '$lib/utils/application-theme-util';
import { applyOledMode } from '$lib/utils/oled-mode-util';
import { AppearanceIcon, MonitorSpeakerIcon, DockIcon, MoonIcon, SunIcon } from '$lib/icons';
- import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
+ import { cn } from '$lib/utils';
let { data } = $props();
const currentSettings = $derived($settingsStore || data.settings!);
@@ -86,27 +84,23 @@
// Navigation Mode state
const modeIsLocal = $derived(persistedState.mode !== undefined);
- const modeDisplayValue = $derived(modeIsLocal ? persistedState.mode : $formInputs.mobileNavigationMode.value);
-
- function handleModeSelect(mode: 'floating' | 'docked') {
- if (modeIsLocal) {
- setLocalOverride('mode', mode);
- } else {
- $formInputs.mobileNavigationMode.value = mode;
- }
- }
+ const modeSegment = $derived<'default' | 'floating' | 'docked'>(
+ modeIsLocal ? (persistedState.mode as 'floating' | 'docked') : 'default'
+ );
- function handleModeScopeChange(isLocal: boolean) {
- if (isLocal) {
- setLocalOverride('mode', $formInputs.mobileNavigationMode.value);
- } else {
+ function handleModeSegmentSelect(segment: 'default' | 'floating' | 'docked') {
+ if (segment === 'default') {
clearLocalOverride('mode');
+ } else {
+ setLocalOverride('mode', segment);
}
}
// Show Labels state
const labelsIsLocal = $derived(persistedState.showLabels !== undefined);
- const labelsDisplayValue = $derived(labelsIsLocal ? persistedState.showLabels : $formInputs.mobileNavigationShowLabels.value);
+ const labelsSegment = $derived<'default' | 'on' | 'off'>(
+ labelsIsLocal ? (persistedState.showLabels ? 'on' : 'off') : 'default'
+ );
const isDarkMode = $derived(mode.current === 'dark');
const isDefaultApplicationTheme = $derived($formInputs.applicationTheme.value === 'default');
@@ -116,19 +110,11 @@
applyOledMode(checked);
}
- function handleLabelsChange(checked: boolean) {
- if (labelsIsLocal) {
- setLocalOverride('showLabels', checked);
- } else {
- $formInputs.mobileNavigationShowLabels.value = checked;
- }
- }
-
- function handleLabelsScopeChange(isLocal: boolean) {
- if (isLocal) {
- setLocalOverride('showLabels', $formInputs.mobileNavigationShowLabels.value);
- } else {
+ function handleLabelsSegmentSelect(segment: 'default' | 'on' | 'off') {
+ if (segment === 'default') {
clearLocalOverride('showLabels');
+ } else {
+ setLocalOverride('showLabels', segment === 'on');
}
}
</script>
@@ -144,219 +130,221 @@
<div class="space-y-8">
<!-- Appearance Section -->
<div class="space-y-4">
- <h3 class="text-lg font-medium">{m.appearance_title()}</h3>
- <div class="bg-card rounded-lg border shadow-sm">
- <div class="space-y-6 p-6">
- <!-- Application Theme -->
- <SettingsRow label={m.application_theme()} description={m.application_theme_description()}>
- <ApplicationThemePicker
- bind:selectedTheme={$formInputs.applicationTheme.value}
- accentColor={$formInputs.accentColor.value}
- disabled={isReadOnly}
- />
- </SettingsRow>
-
- <Separator />
-
- <!-- Accent Color -->
- <SettingsRow label={m.accent_color()} description={m.accent_color_description()}>
- <AccentColorPicker
- previousColor={currentSettings.accentColor}
- bind:selectedColor={$formInputs.accentColor.value}
- disabled={isReadOnly}
- />
- </SettingsRow>
-
- <!-- User Avatars -->
- <SettingsRow
- label={m.general_user_avatars_heading()}
- description={m.general_user_avatars_description()}
- contentClass="flex items-center gap-2"
- >
- <Switch
- id="enableGravatar"
- bind:checked={$formInputs.enableGravatar.value}
- disabled={isReadOnly}
- onCheckedChange={(checked) => {
- $formInputs.enableGravatar.value = checked;
- }}
- />
- <Label for="enableGravatar" class="font-normal">
- {m.general_enable_gravatar_label()}
- </Label>
- </SettingsRow>
-
- <Separator />
-
- <!-- Language -->
- <SettingsRow
- label={m.language()}
- description={m.appearance_language_current_user_description()}
- contentClass="flex items-center gap-2"
- >
- <LocalePicker
- inline={true}
- id="appearanceLocalePicker"
- class="border-border/30 text-foreground h-9 w-32 text-sm font-medium"
- />
- </SettingsRow>
-
- <Separator />
-
- <!-- Theme -->
- <SettingsRow
- label={m.common_toggle_theme()}
- description={m.appearance_theme_current_user_description()}
- contentClass="flex items-center gap-2"
- >
- <ArcaneButton action="base" tone="outline" class="h-9 min-w-40 justify-start gap-2" onclick={toggleMode}>
- {#if isDarkMode}
- <SunIcon class="size-4" />
- {:else}
- <MoonIcon class="size-4" />
- {/if}
- <span>{isDarkMode ? m.sidebar_dark_mode() : m.sidebar_light_mode()}</span>
- </ArcaneButton>
- </SettingsRow>
-
- <Separator />
-
- <!-- OLED Mode -->
- <SettingsRow label={m.oled_mode()} description={m.oled_mode_description()} contentClass="flex items-center gap-2">
- {#snippet helpText()}
- {#if !isDefaultApplicationTheme}
- <p class="text-muted-foreground/70 mt-1 text-xs italic">{m.oled_mode_requires_default_theme()}</p>
- {:else if !isDarkMode}
- <p class="text-muted-foreground/70 mt-1 text-xs italic">{m.oled_mode_requires_dark()}</p>
- {/if}
- {/snippet}
- <Switch
- id="oledMode"
- checked={$formInputs.oledMode.value}
- disabled={isReadOnly || !isDefaultApplicationTheme}
- onCheckedChange={handleOledModeChange}
- />
- <Label for="oledMode" class="font-normal">
- {$formInputs.oledMode.value ? m.oled_mode_enabled() : m.oled_mode_disabled()}
- </Label>
- </SettingsRow>
- </div>
+ <h3 class="text-base font-semibold">{m.appearance_title()}</h3>
+ <div class="divide-border/40 divide-y [&>*]:py-5 [&>*:first-child]:pt-0 [&>*:last-child]:pb-0">
+ <!-- Application Theme -->
+ <SettingsRow label={m.application_theme()} description={m.application_theme_description()}>
+ <ApplicationThemePicker
+ bind:selectedTheme={$formInputs.applicationTheme.value}
+ accentColor={$formInputs.accentColor.value}
+ disabled={isReadOnly}
+ />
+ </SettingsRow>
+
+ <!-- Accent Color -->
+ <SettingsRow label={m.accent_color()} description={m.accent_color_description()}>
+ <AccentColorPicker
+ previousColor={currentSettings.accentColor}
+ bind:selectedColor={$formInputs.accentColor.value}
+ disabled={isReadOnly}
+ />
+ </SettingsRow>
+
+ <!-- User Avatars -->
+ <SettingsRow
+ label={m.general_user_avatars_heading()}
+ description={m.general_user_avatars_description()}
+ layout="inline"
+ >
+ <Switch
+ id="enableGravatar"
+ bind:checked={$formInputs.enableGravatar.value}
+ disabled={isReadOnly}
+ onCheckedChange={(checked) => {
+ $formInputs.enableGravatar.value = checked;
+ }}
+ />
+ </SettingsRow>
+
+ <!-- Language -->
+ <SettingsRow label={m.language()} description={m.appearance_language_current_user_description()} layout="inline">
+ <LocalePicker
+ inline={true}
+ id="appearanceLocalePicker"
+ class="border-border/30 text-foreground h-9 w-32 text-sm font-medium"
+ />
+ </SettingsRow>
+
+ <!-- Theme -->
+ <SettingsRow
+ label={m.common_toggle_theme()}
+ description={m.appearance_theme_current_user_description()}
+ layout="inline"
+ >
+ <ArcaneButton action="base" tone="outline" class="h-9 min-w-40 justify-start gap-2" onclick={toggleMode}>
+ {#if isDarkMode}
+ <SunIcon class="size-4" />
+ {:else}
+ <MoonIcon class="size-4" />
+ {/if}
+ <span>{isDarkMode ? m.sidebar_dark_mode() : m.sidebar_light_mode()}</span>
+ </ArcaneButton>
+ </SettingsRow>
+
+ <!-- OLED Mode -->
+ <SettingsRow label={m.oled_mode()} description={m.oled_mode_description()} layout="inline">
+ {#snippet helpText()}
+ {#if !isDefaultApplicationTheme}
+ <p class="text-muted-foreground/70 mt-1 text-xs italic">{m.oled_mode_requires_default_theme()}</p>
+ {:else if !isDarkMode}
+ <p class="text-muted-foreground/70 mt-1 text-xs italic">{m.oled_mode_requires_dark()}</p>
+ {/if}
+ {/snippet}
+ <Switch
+ id="oledMode"
+ checked={$formInputs.oledMode.value}
+ disabled={isReadOnly || !isDefaultApplicationTheme}
+ onCheckedChange={handleOledModeChange}
+ />
+ </SettingsRow>
</div>
</div>
<!-- Desktop Sidebar Section -->
<div class="space-y-4">
- <h3 class="text-lg font-medium">{m.navigation_desktop_sidebar_title()}</h3>
- <div class="bg-card rounded-lg border shadow-sm">
- <div class="space-y-6 p-6">
- <SettingsRow
- label={m.navigation_sidebar_hover_expansion_label()}
- description={m.navigation_sidebar_hover_expansion_description()}
- contentClass="flex items-center gap-2"
- >
- <Switch
- id="sidebarHoverExpansion"
- checked={$formInputs.sidebarHoverExpansion.value}
- disabled={isReadOnly}
- onCheckedChange={(checked) => {
- $formInputs.sidebarHoverExpansion.value = checked;
- if (sidebar) {
- sidebar.setHoverExpansion(checked);
- }
- }}
- />
- <Label for="sidebarHoverExpansion" class="font-normal">
- {$formInputs.sidebarHoverExpansion.value
- ? m.navigation_sidebar_hover_expansion_enabled()
- : m.navigation_sidebar_hover_expansion_disabled()}
- </Label>
- </SettingsRow>
-
- <Separator />
-
- <!-- Keyboard Shortcuts -->
- <SettingsRow
- label={m.navigation_keyboard_shortcuts_label()}
- description={m.navigation_keyboard_shortcuts_description()}
- contentClass="flex items-center gap-2"
- >
- <Switch
- id="keyboardShortcutsEnabled"
- checked={$formInputs.keyboardShortcutsEnabled.value}
- disabled={isReadOnly}
- onCheckedChange={(checked) => {
- $formInputs.keyboardShortcutsEnabled.value = checked;
- }}
- />
- <Label for="keyboardShortcutsEnabled" class="font-normal">
- {$formInputs.keyboardShortcutsEnabled.value
- ? m.navigation_keyboard_shortcuts_enabled()
- : m.navigation_keyboard_shortcuts_disabled()}
- </Label>
- </SettingsRow>
- </div>
+ <h3 class="text-base font-semibold">{m.navigation_desktop_sidebar_title()}</h3>
+ <div class="divide-border/40 divide-y [&>*]:py-5 [&>*:first-child]:pt-0 [&>*:last-child]:pb-0">
+ <SettingsRow
+ label={m.navigation_sidebar_hover_expansion_label()}
+ description={m.navigation_sidebar_hover_expansion_description()}
+ layout="inline"
+ >
+ <Switch
+ id="sidebarHoverExpansion"
+ checked={$formInputs.sidebarHoverExpansion.value}
+ disabled={isReadOnly}
+ onCheckedChange={(checked) => {
+ $formInputs.sidebarHoverExpansion.value = checked;
+ if (sidebar) {
+ sidebar.setHoverExpansion(checked);
+ }
+ }}
+ />
+ </SettingsRow>
+
+ <!-- Keyboard Shortcuts -->
+ <SettingsRow
+ label={m.navigation_keyboard_shortcuts_label()}
+ description={m.navigation_keyboard_shortcuts_description()}
+ layout="inline"
+ >
+ <Switch
+ id="keyboardShortcutsEnabled"
+ checked={$formInputs.keyboardShortcutsEnabled.value}
+ disabled={isReadOnly}
+ onCheckedChange={(checked) => {
+ $formInputs.keyboardShortcutsEnabled.value = checked;
+ }}
+ />
+ </SettingsRow>
</div>
</div>
<!-- Mobile Appearance Section -->
<div class="space-y-4">
- <h3 class="text-lg font-medium">{m.navigation_mobile_appearance_title()}</h3>
- <div class="bg-card rounded-lg border shadow-sm">
- <div class="space-y-6 p-6">
- <!-- Navigation Mode -->
- <SettingsRow label={m.navigation_mode_label()} description={m.navigation_mode_description()} contentClass="space-y-3">
- <SwitchWithLabel
- id="mode-scope-toggle"
- checked={modeIsLocal}
- label={modeIsLocal ? m.this_device() : m.server_default()}
- onCheckedChange={handleModeScopeChange}
- disabled={isReadOnly && !modeIsLocal}
- />
-
- <div class="grid grid-cols-2 gap-2">
- <ArcaneButton
- action="base"
- tone={modeDisplayValue === 'floating' ? 'outline-primary' : 'outline'}
- class="h-12 w-full"
- onclick={() => handleModeSelect('floating')}
- icon={MonitorSpeakerIcon}
- customLabel={m.navigation_mode_floating()}
- />
- <ArcaneButton
- action="base"
- tone={modeDisplayValue === 'docked' ? 'outline-primary' : 'outline'}
- class="h-12 w-full"
- onclick={() => handleModeSelect('docked')}
- icon={DockIcon}
- customLabel={m.navigation_mode_docked()}
- />
- </div>
- </SettingsRow>
-
- <Separator />
-
- <!-- Show Labels -->
- <SettingsRow
- label={m.navigation_show_labels_label()}
- description={m.navigation_show_labels_description()}
- contentClass="space-y-3"
- >
- <SwitchWithLabel
- id="labels-scope-toggle"
- checked={labelsIsLocal}
- label={labelsIsLocal ? m.this_device() : m.server_default()}
- onCheckedChange={handleLabelsScopeChange}
- disabled={isReadOnly && !labelsIsLocal}
- />
-
- <div class="flex items-center gap-3">
- <Switch id="mobileNavigationShowLabels" checked={labelsDisplayValue} onCheckedChange={handleLabelsChange} />
- <span class="text-sm font-medium">
- {labelsDisplayValue ? m.on() : m.off()}
- </span>
- </div>
- </SettingsRow>
- </div>
+ <h3 class="text-base font-semibold">{m.navigation_mobile_appearance_title()}</h3>
+ <div class="divide-border/40 divide-y [&>*]:py-5 [&>*:first-child]:pt-0 [&>*:last-child]:pb-0">
+ <!-- Navigation Mode -->
+ <SettingsRow label={m.navigation_mode_label()} description={m.navigation_mode_description()}>
+ <div class="bg-muted/40 inline-flex rounded-lg p-0.5">
+ <button
+ type="button"
+ disabled={isReadOnly && modeSegment !== 'default'}
+ onclick={() => handleModeSegmentSelect('default')}
+ class={cn(
+ 'rounded-md px-3 py-1.5 text-xs font-medium transition-colors',
+ modeSegment === 'default'
+ ? 'bg-background text-foreground shadow-sm'
+ : 'text-muted-foreground hover:text-foreground'
+ )}
+ >
+ {m.server_default()}
+ </button>
+ <button
+ type="button"
+ disabled={isReadOnly && modeSegment === 'default'}
+ onclick={() => handleModeSegmentSelect('floating')}
+ class={cn(
+ 'inline-flex items-center gap-1.5 rounded-md px-3 py-1.5 text-xs font-medium transition-colors',
+ modeSegment === 'floating'
+ ? 'bg-background text-foreground shadow-sm'
+ : 'text-muted-foreground hover:text-foreground'
+ )}
+ >
+ <MonitorSpeakerIcon class="size-3.5" />
+ {m.navigation_mode_floating()}
+ </button>
+ <button
+ type="button"
+ disabled={isReadOnly && modeSegment === 'default'}
+ onclick={() => handleModeSegmentSelect('docked')}
+ class={cn(
+ 'inline-flex items-center gap-1.5 rounded-md px-3 py-1.5 text-xs font-medium transition-colors',
+ modeSegment === 'docked'
+ ? 'bg-background text-foreground shadow-sm'
+ : 'text-muted-foreground hover:text-foreground'
+ )}
+ >
+ <DockIcon class="size-3.5" />
+ {m.navigation_mode_docked()}
+ </button>
+ </div>
+ </SettingsRow>
+
+ <!-- Show Labels -->
+ <SettingsRow label={m.navigation_show_labels_label()} description={m.navigation_show_labels_description()}>
+ <div class="bg-muted/40 inline-flex rounded-lg p-0.5">
+ <button
+ type="button"
+ disabled={isReadOnly && labelsSegment !== 'default'}
+ onclick={() => handleLabelsSegmentSelect('default')}
+ class={cn(
+ 'rounded-md px-3 py-1.5 text-xs font-medium transition-colors',
+ labelsSegment === 'default'
+ ? 'bg-background text-foreground shadow-sm'
+ : 'text-muted-foreground hover:text-foreground'
+ )}
+ >
+ {m.server_default()}
+ </button>
+ <button
+ type="button"
+ disabled={isReadOnly && labelsSegment === 'default'}
+ onclick={() => handleLabelsSegmentSelect('on')}
+ class={cn(
+ 'rounded-md px-3 py-1.5 text-xs font-medium transition-colors',
+ labelsSegment === 'on'
+ ? 'bg-background text-foreground shadow-sm'
+ : 'text-muted-foreground hover:text-foreground'
+ )}
+ >
+ {m.on()}
+ </button>
+ <button
+ type="button"
+ disabled={isReadOnly && labelsSegment === 'default'}
+ onclick={() => handleLabelsSegmentSelect('off')}
+ class={cn(
+ 'rounded-md px-3 py-1.5 text-xs font-medium transition-colors',
+ labelsSegment === 'off'
+ ? 'bg-background text-foreground shadow-sm'
+ : 'text-muted-foreground hover:text-foreground'
+ )}
+ >
+ {m.off()}
+ </button>
+ </div>
+ </SettingsRow>
</div>
</div>
</div>
diff --git a/frontend/src/routes/(app)/settings/authentication/+page.svelte b/frontend/src/routes/(app)/settings/authentication/+page.svelte
index 02fec932a..f2e89385d 100644
--- a/frontend/src/routes/(app)/settings/authentication/+page.svelte
+++ b/frontend/src/routes/(app)/settings/authentication/+page.svelte
@@ -3,22 +3,22 @@
import { z } from 'zod/v4';
import { getContext } from 'svelte';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
- import { Input } from '$lib/components/ui/input';
- import { Label } from '$lib/components/ui/label';
import { Switch } from '$lib/components/ui/switch/index.js';
- import { Separator } from '$lib/components/ui/separator';
+ import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';
import { toast } from 'svelte-sonner';
import type { PageData } from './$types';
import type { Settings } from '$lib/types/settings.type';
import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import { m } from '$lib/paraglide/messages';
- import { LockIcon, InfoIcon } from '$lib/icons';
+ import { LockIcon, InfoIcon, ArrowDownIcon } from '$lib/icons';
import settingsStore from '$lib/stores/config-store';
import { SettingsPageLayout } from '$lib/layouts';
import { CopyButton } from '$lib/components/ui/copy-button';
import { createSettingsForm } from '$lib/utils/settings-form.util';
import * as Alert from '$lib/components/ui/alert';
+ import * as Collapsible from '$lib/components/ui/collapsible';
import SettingsRow from '$lib/components/settings/settings-row.svelte';
+ import { cn } from '$lib/utils';
let { data }: { data: PageData } = $props();
const currentSettings = $derived<Settings>($settingsStore || data.settings!);
@@ -60,6 +60,7 @@
});
let showMergeAccountsAlert = $state(false);
+ let oidcConfigOpen = $state(false);
const formDefaults = $derived({
authLocalEnabled: currentSettings.authLocalEnabled,
@@ -234,7 +235,7 @@
{#snippet mainContent()}
<fieldset disabled={isReadOnly} class="relative space-y-8">
<div class="space-y-4">
- <h3 class="text-lg font-medium">{m.security_authentication_heading()}</h3>
+ <h3 class="text-base font-semibold">{m.security_authentication_heading()}</h3>
{#if isAutoLoginEnabled}
<Alert.Root variant="default" class="border-amber-200 bg-amber-50 dark:border-amber-800 dark:bg-amber-950">
@@ -245,30 +246,17 @@
</Alert.Description>
</Alert.Root>
{:else}
- <div class="bg-card rounded-lg border shadow-sm">
- <div class="space-y-6 p-6">
- <SettingsRow
- label={m.security_local_auth_label()}
- description={m.security_local_auth_description()}
- contentClass="flex items-center gap-2"
- >
- <Switch
- id="localAuthSwitch"
- bind:checked={$formInputs.authLocalEnabled.value}
- onCheckedChange={handleLocalSwitchChange}
- />
- <Label for="localAuthSwitch" class="font-normal">
- {$formInputs.authLocalEnabled.value ? m.common_enabled() : m.common_disabled()}
- </Label>
- </SettingsRow>
-
- <Separator />
+ <div class="divide-border/40 divide-y [&>*]:py-5 [&>*:first-child]:pt-0 [&>*:last-child]:pb-0">
+ <SettingsRow label={m.security_local_auth_label()} description={m.security_local_auth_description()} layout="inline">
+ <Switch
+ id="localAuthSwitch"
+ bind:checked={$formInputs.authLocalEnabled.value}
+ onCheckedChange={handleLocalSwitchChange}
+ />
+ </SettingsRow>
- <SettingsRow
- label={m.security_oidc_auth_label()}
- description={m.security_oidc_auth_description()}
- contentClass="space-y-4"
- >
+ <Collapsible.Root bind:open={oidcConfigOpen}>
+ <SettingsRow label={m.security_oidc_auth_label()} description={m.security_oidc_auth_description()} layout="inline">
{#snippet labelExtra()}
{#if isOidcEnvForced}
<div class="mt-2">
@@ -295,203 +283,151 @@
</div>
{/if}
{/snippet}
- <div class="flex items-center gap-2">
+ <div class="flex flex-col items-end gap-2">
<Switch
id="oidcEnabledSwitch"
disabled={isOidcEnvForced}
bind:checked={$formInputs.oidcEnabled.value}
onCheckedChange={handleOidcEnabledChange}
/>
- <Label for="oidcEnabledSwitch" class="font-normal">
- {m.security_oidc_enabled_label()}
- </Label>
+ {#if showOidcDetails}
+ <Collapsible.Trigger
+ class="text-muted-foreground hover:text-foreground hover:bg-muted/50 inline-flex items-center gap-1.5 rounded-md px-2 py-1 text-xs font-medium transition-colors"
+ >
+ <span>{oidcConfigOpen ? m.common_hide() : m.common_show()} {m.common_configuration()}</span>
+ <ArrowDownIcon class={cn('size-3.5 transition-transform', oidcConfigOpen && 'rotate-180')} />
+ </Collapsible.Trigger>
+ {/if}
</div>
+ </SettingsRow>
- {#if showOidcDetails}
- <div class="space-y-4 pt-2">
- <div class="space-y-2">
- <Label for="oidcClientId" class="text-sm font-medium">{m.oidc_client_id_label()}</Label>
- <Input
+ {#if showOidcDetails}
+ <Collapsible.Content class="mt-4">
+ <div class="border-border/60 space-y-5 border-l-2 pl-5">
+ <div class="grid gap-5 sm:grid-cols-2">
+ <TextInputWithLabel
id="oidcClientId"
- type="text"
+ label={m.oidc_client_id_label()}
placeholder={m.oidc_client_id_placeholder()}
disabled={isOidcEnvForced}
bind:value={$formInputs.oidcClientId.value}
- class="font-mono text-sm"
+ error={$formInputs.oidcClientId.error}
/>
- {#if $formInputs.oidcClientId.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcClientId.error}</p>
- {/if}
- </div>
-
- <div class="space-y-2">
- <Label for="oidcClientSecret" class="text-sm font-medium">{m.oidc_client_secret_label()}</Label>
- <Input
+ <TextInputWithLabel
id="oidcClientSecret"
type="password"
+ label={m.oidc_client_secret_label()}
placeholder={m.oidc_client_secret_placeholder()}
disabled={isOidcEnvForced}
bind:value={$formInputs.oidcClientSecret.value}
- class="font-mono text-sm"
+ error={$formInputs.oidcClientSecret.error}
+ helpText={m.security_oidc_client_secret_help()}
/>
- <p class="text-muted-foreground text-xs">{m.security_oidc_client_secret_help()}</p>
- {#if $formInputs.oidcClientSecret.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcClientSecret.error}</p>
- {/if}
</div>
- <div class="space-y-2">
- <Label for="oidcIssuerUrl" class="text-sm font-medium">{m.oidc_issuer_url_label()}</Label>
- <Input
- id="oidcIssuerUrl"
- type="text"
- placeholder={m.oidc_issuer_url_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcIssuerUrl.value}
- class="font-mono text-sm"
- />
- <p class="text-muted-foreground text-xs">{m.oidc_issuer_url_description()}</p>
- {#if $formInputs.oidcIssuerUrl.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcIssuerUrl.error}</p>
- {/if}
- </div>
+ <TextInputWithLabel
+ id="oidcIssuerUrl"
+ label={m.oidc_issuer_url_label()}
+ description={m.oidc_issuer_url_description()}
+ placeholder={m.oidc_issuer_url_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcIssuerUrl.value}
+ error={$formInputs.oidcIssuerUrl.error}
+ />
- <div class="space-y-2">
- <Label for="oidcProviderName" class="text-sm font-medium">{m.oidc_provider_name_label()}</Label>
- <Input
+ <div class="grid gap-5 sm:grid-cols-2">
+ <TextInputWithLabel
id="oidcProviderName"
- type="text"
+ label={m.oidc_provider_name_label()}
+ description={m.oidc_provider_name_description()}
placeholder={m.oidc_provider_name_placeholder()}
disabled={isOidcEnvForced}
bind:value={$formInputs.oidcProviderName.value}
- class="font-mono text-sm"
+ error={$formInputs.oidcProviderName.error}
/>
- <p class="text-muted-foreground text-xs">{m.oidc_provider_name_description()}</p>
- {#if $formInputs.oidcProviderName.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcProviderName.error}</p>
- {/if}
- </div>
-
- <div class="space-y-2">
- <Label for="oidcProviderLogoUrl" class="text-sm font-medium">{m.oidc_provider_logo_url_label()}</Label>
- <Input
+ <TextInputWithLabel
id="oidcProviderLogoUrl"
- type="text"
+ label={m.oidc_provider_logo_url_label()}
+ description={m.oidc_provider_logo_url_description()}
placeholder={m.oidc_provider_logo_url_placeholder()}
disabled={isOidcEnvForced}
bind:value={$formInputs.oidcProviderLogoUrl.value}
- class="font-mono text-sm"
+ error={$formInputs.oidcProviderLogoUrl.error}
/>
- <p class="text-muted-foreground text-xs">{m.oidc_provider_logo_url_description()}</p>
- {#if $formInputs.oidcProviderLogoUrl.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcProviderLogoUrl.error}</p>
- {/if}
</div>
- <div class="space-y-2">
- <Label for="oidcScopes" class="text-sm font-medium">{m.oidc_scopes_label()}</Label>
- <Input
- id="oidcScopes"
- type="text"
- placeholder={m.oidc_scopes_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcScopes.value}
- class="font-mono text-sm"
- />
- {#if $formInputs.oidcScopes.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcScopes.error}</p>
- {/if}
- </div>
+ <TextInputWithLabel
+ id="oidcScopes"
+ label={m.oidc_scopes_label()}
+ placeholder={m.oidc_scopes_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcScopes.value}
+ error={$formInputs.oidcScopes.error}
+ />
- <div class="border-t pt-4">
- <h4 class="text-sm font-semibold">{m.oidc_admin_role_mapping_title()}</h4>
- <p class="text-muted-foreground mb-3 text-xs">{m.oidc_admin_role_mapping_description()}</p>
- <div class="grid gap-3 sm:grid-cols-2">
- <div class="space-y-2">
- <Label for="oidcAdminClaim" class="text-sm font-medium">{m.oidc_admin_claim_label()}</Label>
- <Input
- id="oidcAdminClaim"
- type="text"
- placeholder={m.oidc_admin_claim_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcAdminClaim.value}
- class="font-mono text-sm"
- />
- {#if $formInputs.oidcAdminClaim.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcAdminClaim.error}</p>
- {/if}
- </div>
- <div class="space-y-2">
- <Label for="oidcAdminValue" class="text-sm font-medium">{m.oidc_admin_value_label()}</Label>
- <Input
- id="oidcAdminValue"
- type="text"
- placeholder={m.oidc_admin_value_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcAdminValue.value}
- class="font-mono text-sm"
- />
- <p class="text-muted-foreground text-[11px]">{m.oidc_admin_value_help()}</p>
- {#if $formInputs.oidcAdminValue.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcAdminValue.error}</p>
- {/if}
- </div>
+ <div class="space-y-3 pt-2">
+ <div>
+ <h4 class="text-sm font-semibold">{m.oidc_admin_role_mapping_title()}</h4>
+ <p class="text-muted-foreground mt-0.5 text-xs">{m.oidc_admin_role_mapping_description()}</p>
+ </div>
+ <div class="grid gap-5 sm:grid-cols-2">
+ <TextInputWithLabel
+ id="oidcAdminClaim"
+ label={m.oidc_admin_claim_label()}
+ placeholder={m.oidc_admin_claim_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcAdminClaim.value}
+ error={$formInputs.oidcAdminClaim.error}
+ />
+ <TextInputWithLabel
+ id="oidcAdminValue"
+ label={m.oidc_admin_value_label()}
+ placeholder={m.oidc_admin_value_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcAdminValue.value}
+ error={$formInputs.oidcAdminValue.error}
+ helpText={m.oidc_admin_value_help()}
+ />
</div>
</div>
- <div class="border-t pt-4">
- <div class="flex items-center gap-2">
+ <div class="divide-border/40 divide-y pt-2 [&>*]:py-5 [&>*:first-child]:pt-0 [&>*:last-child]:pb-0">
+ <SettingsRow
+ label={m.security_oidc_merge_accounts_label()}
+ description={m.security_oidc_merge_accounts_description()}
+ layout="inline"
+ >
<Switch
id="oidcMergeAccountsSwitch"
disabled={isOidcEnvForced}
bind:checked={$formInputs.oidcMergeAccounts.value}
onCheckedChange={handleMergeAccountsChange}
/>
- <div class="grid gap-1.5 leading-none">
- <Label for="oidcMergeAccountsSwitch" class="font-normal">
- {m.security_oidc_merge_accounts_label()}
- </Label>
- <p class="text-muted-foreground text-xs">
- {m.security_oidc_merge_accounts_description()}
- </p>
- </div>
- </div>
- </div>
+ </SettingsRow>
- <div class="border-t pt-4">
- <div class="flex items-center gap-2">
+ <SettingsRow
+ label={m.oidc_skip_tls_verify_label()}
+ description={m.oidc_skip_tls_verify_description()}
+ layout="inline"
+ >
<Switch
id="oidcSkipTlsVerifySwitch"
disabled={isOidcEnvForced}
bind:checked={$formInputs.oidcSkipTlsVerify.value}
/>
- <div class="grid gap-1.5 leading-none">
- <Label for="oidcSkipTlsVerifySwitch" class="font-normal">
- {m.oidc_skip_tls_verify_label()}
- </Label>
- <p class="text-muted-foreground text-xs">
- {m.oidc_skip_tls_verify_description()}
- </p>
- </div>
- </div>
- </div>
+ </SettingsRow>
- <div class="border-t pt-4">
- <div class="flex items-center gap-2">
+ <SettingsRow
+ label={m.oidc_auto_redirect_label()}
+ description={m.oidc_auto_redirect_description()}
+ layout="inline"
+ >
<Switch
id="oidcAutoRedirectSwitch"
disabled={isOidcEnvForced}
bind:checked={$formInputs.oidcAutoRedirectToProvider.value}
/>
- <div class="grid gap-1.5 leading-none">
- <Label for="oidcAutoRedirectSwitch" class="font-normal">
- {m.oidc_auto_redirect_label()}
- </Label>
- <p class="text-muted-foreground text-xs">
- {m.oidc_auto_redirect_description()}
- </p>
- </div>
- </div>
+ </SettingsRow>
</div>
<div class="bg-muted/30 rounded-lg border p-4">
@@ -506,90 +442,77 @@
</div>
</div>
</div>
- {/if}
- </SettingsRow>
- </div>
+ </Collapsible.Content>
+ {/if}
+ </Collapsible.Root>
</div>
{/if}
</div>
<div class="space-y-4">
- <h3 class="text-lg font-medium">{m.security_session_heading()}</h3>
- <div class="bg-card rounded-lg border shadow-sm">
- <div class="space-y-6 p-6">
- <SettingsRow
- label={m.security_session_timeout_label()}
- description={m.security_session_timeout_description()}
- contentClass="max-w-xs"
- >
- <Input
- id="authSessionTimeout"
- type="number"
- bind:value={$formInputs.authSessionTimeout.value}
- aria-label={m.security_session_timeout_label()}
- />
- {#if $formInputs.authSessionTimeout.error}
- <p class="text-destructive mt-2 text-sm">{$formInputs.authSessionTimeout.error}</p>
- {/if}
- </SettingsRow>
- </div>
+ <h3 class="text-base font-semibold">{m.security_session_heading()}</h3>
+ <div class="max-w-xs">
+ <TextInputWithLabel
+ id="authSessionTimeout"
+ type="number"
+ label={m.security_session_timeout_label()}
+ description={m.security_session_timeout_description()}
+ bind:value={$formInputs.authSessionTimeout.value}
+ error={$formInputs.authSessionTimeout.error}
+ />
</div>
</div>
<div class="space-y-4">
- <h3 class="text-lg font-medium">{m.security_password_policy_label()}</h3>
- <div class="bg-card rounded-lg border shadow-sm">
- <div class="space-y-6 p-6">
- <SettingsRow label={m.security_password_policy_label()} description={m.security_password_policy_description()}>
- <div class="grid grid-cols-1 gap-2 sm:grid-cols-3 sm:gap-3" role="group" aria-labelledby="passwordPolicyLabel">
- <ArcaneTooltip.Root>
- <ArcaneTooltip.Trigger>
- <ArcaneButton
- action="base"
- tone={$formInputs.authPasswordPolicy.value === 'basic' ? 'outline-primary' : 'outline'}
- class="h-12 w-full text-xs sm:text-sm"
- onclick={() => ($formInputs.authPasswordPolicy.value = 'basic')}
- customLabel={m.common_basic()}
- />
- </ArcaneTooltip.Trigger>
- <ArcaneTooltip.Content side="top">
- {m.security_password_policy_basic_tooltip()}
- </ArcaneTooltip.Content>
- </ArcaneTooltip.Root>
-
- <ArcaneTooltip.Root>
- <ArcaneTooltip.Trigger>
- <ArcaneButton
- action="base"
- tone={$formInputs.authPasswordPolicy.value === 'standard' ? 'outline-primary' : 'outline'}
- class="h-12 w-full text-xs sm:text-sm"
- onclick={() => ($formInputs.authPasswordPolicy.value = 'standard')}
- customLabel={m.security_password_policy_standard()}
- />
- </ArcaneTooltip.Trigger>
- <ArcaneTooltip.Content side="top">
- {m.security_password_policy_standard_tooltip()}
- </ArcaneTooltip.Content>
- </ArcaneTooltip.Root>
-
- <ArcaneTooltip.Root>
- <ArcaneTooltip.Trigger>
- <ArcaneButton
- action="base"
- tone={$formInputs.authPasswordPolicy.value === 'strong' ? 'outline-primary' : 'outline'}
- class="h-12 w-full text-xs sm:text-sm"
- onclick={() => ($formInputs.authPasswordPolicy.value = 'strong')}
- customLabel={m.security_password_policy_strong()}
- />
- </ArcaneTooltip.Trigger>
- <ArcaneTooltip.Content side="top">
- {m.security_password_policy_strong_tooltip()}
- </ArcaneTooltip.Content>
- </ArcaneTooltip.Root>
- </div>
- </SettingsRow>
+ <h3 class="text-base font-semibold">{m.security_password_policy_label()}</h3>
+ <SettingsRow label={m.security_password_policy_label()} description={m.security_password_policy_description()}>
+ <div class="grid grid-cols-1 gap-2 sm:grid-cols-3 sm:gap-3" role="group" aria-labelledby="passwordPolicyLabel">
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <ArcaneButton
+ action="base"
+ tone={$formInputs.authPasswordPolicy.value === 'basic' ? 'outline-primary' : 'outline'}
+ class="h-12 w-full text-xs sm:text-sm"
+ onclick={() => ($formInputs.authPasswordPolicy.value = 'basic')}
+ customLabel={m.common_basic()}
+ />
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="top">
+ {m.security_password_policy_basic_tooltip()}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <ArcaneButton
+ action="base"
+ tone={$formInputs.authPasswordPolicy.value === 'standard' ? 'outline-primary' : 'outline'}
+ class="h-12 w-full text-xs sm:text-sm"
+ onclick={() => ($formInputs.authPasswordPolicy.value = 'standard')}
+ customLabel={m.security_password_policy_standard()}
+ />
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="top">
+ {m.security_password_policy_standard_tooltip()}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <ArcaneButton
+ action="base"
+ tone={$formInputs.authPasswordPolicy.value === 'strong' ? 'outline-primary' : 'outline'}
+ class="h-12 w-full text-xs sm:text-sm"
+ onclick={() => ($formInputs.authPasswordPolicy.value = 'strong')}
+ customLabel={m.security_password_policy_strong()}
+ />
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="top">
+ {m.security_password_policy_strong_tooltip()}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
</div>
- </div>
+ </SettingsRow>
</div>
</fieldset>
{/snippet}
diff --git a/frontend/src/routes/(app)/settings/builds/+page.svelte b/frontend/src/routes/(app)/settings/builds/+page.svelte
index f872d2f2e..6d0536078 100644
--- a/frontend/src/routes/(app)/settings/builds/+page.svelte
+++ b/frontend/src/routes/(app)/settings/builds/+page.svelte
@@ -3,7 +3,6 @@
import { z } from 'zod/v4';
import settingsStore from '$lib/stores/config-store';
import { SettingsPageLayout } from '$lib/layouts';
- import SettingsRow from '$lib/components/settings/settings-row.svelte';
import { CodeIcon } from '$lib/icons';
import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';
import SelectWithLabel from '$lib/components/form/select-with-label.svelte';
@@ -92,102 +91,67 @@
{#snippet mainContent()}
<fieldset disabled={isReadOnly} class="relative space-y-8">
<div class="space-y-4">
- <h3 class="text-lg font-medium">{m.build_settings_workspace_section_title()}</h3>
- <div class="bg-card rounded-lg border shadow-sm">
- <div class="space-y-6 p-6">
- <SettingsRow
- label={m.build_settings_directory_label()}
- description={m.build_settings_directory_description()}
- contentClass="max-w-xl"
- >
- <TextInputWithLabel
- bind:value={$formInputs.buildsDirectory.value}
- error={$formInputs.buildsDirectory.error}
- label={m.build_settings_directory_label()}
- placeholder={m.build_settings_directory_placeholder()}
- helpText={m.build_settings_directory_help()}
- />
- </SettingsRow>
- </div>
+ <h3 class="text-base font-semibold">{m.build_settings_workspace_section_title()}</h3>
+ <div class="max-w-xl">
+ <TextInputWithLabel
+ bind:value={$formInputs.buildsDirectory.value}
+ error={$formInputs.buildsDirectory.error}
+ label={m.build_settings_directory_label()}
+ description={m.build_settings_directory_description()}
+ placeholder={m.build_settings_directory_placeholder()}
+ helpText={m.build_settings_directory_help()}
+ />
</div>
</div>
<div class="space-y-4">
- <h3 class="text-lg font-medium">{m.build_settings_provider_section_title()}</h3>
- <div class="bg-card rounded-lg border shadow-sm">
- <div class="space-y-6 p-6">
- <SettingsRow
+ <h3 class="text-base font-semibold">{m.build_settings_provider_section_title()}</h3>
+ <div class="grid gap-5 sm:grid-cols-2">
+ <div>
+ <SelectWithLabel
+ id="build-provider"
+ name="buildProvider"
+ bind:value={$formInputs.buildProvider.value}
+ error={$formInputs.buildProvider.error}
label={m.build_settings_default_provider_label()}
description={m.build_settings_default_provider_description()}
- contentClass="max-w-xs"
- >
- <SelectWithLabel
- id="build-provider"
- name="buildProvider"
- bind:value={$formInputs.buildProvider.value}
- error={$formInputs.buildProvider.error}
- label={m.build_settings_provider_section_title()}
- options={providerOptions}
- />
- {#if !depotCredentialsPresent && !depotConfigured}
- <p class="text-muted-foreground mt-2 text-xs">{m.build_settings_depot_enable_hint()}</p>
- {/if}
- </SettingsRow>
-
- <div class="border-t pt-6">
- <SettingsRow
- label={m.build_settings_timeout_label()}
- description={m.build_settings_timeout_description()}
- contentClass="max-w-xs"
- >
- <TextInputWithLabel
- bind:value={$formInputs.buildTimeout.value}
- error={$formInputs.buildTimeout.error}
- label={m.build_settings_timeout_label()}
- placeholder={m.build_settings_timeout_placeholder()}
- helpText={m.build_settings_timeout_help()}
- type="number"
- />
- </SettingsRow>
- </div>
+ options={providerOptions}
+ />
+ {#if !depotCredentialsPresent && !depotConfigured}
+ <p class="text-muted-foreground mt-2 text-xs">{m.build_settings_depot_enable_hint()}</p>
+ {/if}
</div>
+ <TextInputWithLabel
+ bind:value={$formInputs.buildTimeout.value}
+ error={$formInputs.buildTimeout.error}
+ label={m.build_settings_timeout_label()}
+ description={m.build_settings_timeout_description()}
+ placeholder={m.build_settings_timeout_placeholder()}
+ helpText={m.build_settings_timeout_help()}
+ type="number"
+ />
</div>
</div>
<div class="space-y-4">
- <h3 class="text-lg font-medium">{m.build_settings_depot_section_title()}</h3>
- <div class="bg-card rounded-lg border shadow-sm">
- <div class="space-y-6 p-6">
- <SettingsRow
- label={m.build_settings_depot_project_id_label()}
- description={m.build_settings_depot_project_id_description()}
- contentClass="max-w-xl"
- >
- <TextInputWithLabel
- bind:value={$formInputs.depotProjectId.value}
- error={$formInputs.depotProjectId.error}
- label={m.build_settings_depot_project_id_label()}
- placeholder={m.build_settings_depot_project_id_placeholder()}
- />
- </SettingsRow>
-
- <div class="border-t pt-6">
- <SettingsRow
- label={m.build_settings_depot_token_label()}
- description={m.build_settings_depot_token_description()}
- contentClass="max-w-xl"
- >
- <TextInputWithLabel
- bind:value={$formInputs.depotToken.value}
- error={$formInputs.depotToken.error}
- label={m.build_settings_depot_token_label()}
- placeholder={m.build_settings_depot_token_placeholder()}
- type="password"
- helpText={m.build_settings_depot_token_help()}
- />
- </SettingsRow>
- </div>
- </div>
+ <h3 class="text-base font-semibold">{m.build_settings_depot_section_title()}</h3>
+ <div class="grid gap-5 sm:grid-cols-2">
+ <TextInputWithLabel
+ bind:value={$formInputs.depotProjectId.value}
+ error={$formInputs.depotProjectId.error}
+ label={m.build_settings_depot_project_id_label()}
+ description={m.build_settings_depot_project_id_description()}
+ placeholder={m.build_settings_depot_project_id_placeholder()}
+ />
+ <TextInputWithLabel
+ bind:value={$formInputs.depotToken.value}
+ error={$formInputs.depotToken.error}
+ label={m.build_settings_depot_token_label()}
+ description={m.build_settings_depot_token_description()}
+ placeholder={m.build_settings_depot_token_placeholder()}
+ type="password"
+ helpText={m.build_settings_depot_token_help()}
+ />
</div>
</div>
</fieldset>
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/AppriseProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/AppriseProviderForm.svelte
index 4b19bfb62..879601dc3 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/AppriseProviderForm.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/AppriseProviderForm.svelte
@@ -53,7 +53,6 @@
id="apprise"
title={m.notifications_apprise_title()}
description={m.notifications_apprise_description()}
- enabledLabel={m.notifications_apprise_enabled_label()}
bind:enabled={values.enabled}
{disabled}
>
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/BuiltInProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/BuiltInProviderForm.svelte
index c13fac622..5aac2b7a7 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/BuiltInProviderForm.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/BuiltInProviderForm.svelte
@@ -35,56 +35,46 @@
let { provider, values = $bindable(), disabled = false, isTesting = false, onTest }: Props = $props();
- const providerMeta: Record<NotificationProviderKey, { title: string; description: string; enabledLabel: string }> = {
+ const providerMeta: Record<NotificationProviderKey, { title: string; description: string }> = {
discord: {
- title: 'Discord',
- description: m.notifications_discord_description(),
- enabledLabel: m.notifications_discord_enabled_label()
+ title: m.notifications_discord_title(),
+ description: m.notifications_discord_description()
},
email: {
- title: 'Email',
- description: m.notifications_email_description(),
- enabledLabel: m.notifications_email_enabled_label()
+ title: m.notifications_email_title(),
+ description: m.notifications_email_description()
},
telegram: {
- title: 'Telegram',
- description: 'Send notifications via Telegram bot',
- enabledLabel: 'Enable Telegram Notifications'
+ title: m.notifications_telegram_title(),
+ description: m.notifications_telegram_description()
},
signal: {
title: m.notifications_signal_title(),
- description: m.notifications_signal_description(),
- enabledLabel: m.notifications_signal_enabled_label()
+ description: m.notifications_signal_description()
},
slack: {
title: m.notifications_slack_title(),
- description: m.notifications_slack_description(),
- enabledLabel: m.notifications_slack_enabled_label()
+ description: m.notifications_slack_description()
},
ntfy: {
- title: 'Ntfy',
- description: m.notifications_ntfy_description(),
- enabledLabel: m.notifications_ntfy_enabled_label()
+ title: m.notifications_ntfy_title(),
+ description: m.notifications_ntfy_description()
},
pushover: {
- title: 'Pushover',
- description: m.notifications_pushover_description(),
- enabledLabel: m.notifications_pushover_enabled_label()
+ title: m.notifications_pushover_title(),
+ description: m.notifications_pushover_description()
},
gotify: {
- title: 'Gotify',
- description: m.notifications_gotify_description(),
- enabledLabel: m.notifications_gotify_enabled_label()
+ title: m.notifications_gotify_title(),
+ description: m.notifications_gotify_description()
},
matrix: {
- title: 'Matrix',
- description: m.notifications_matrix_description(),
- enabledLabel: m.notifications_matrix_enabled_label()
+ title: m.notifications_matrix_title(),
+ description: m.notifications_matrix_description()
},
generic: {
title: m.notifications_generic_title(),
- description: m.notifications_generic_description(),
- enabledLabel: m.notifications_generic_enabled_label()
+ description: m.notifications_generic_description()
}
};
@@ -1096,7 +1086,6 @@
id={provider}
title={selectedMeta.title}
description={selectedMeta.description}
- enabledLabel={selectedMeta.enabledLabel}
bind:enabled={values.enabled}
{disabled}
>
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/ProviderFormWrapper.svelte b/frontend/src/routes/(app)/settings/notifications/providers/ProviderFormWrapper.svelte
index 4b15f84b1..50d6356be 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/ProviderFormWrapper.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/ProviderFormWrapper.svelte
@@ -1,5 +1,4 @@
<script lang="ts">
- import { Label } from '$lib/components/ui/label';
import SettingsRow from '$lib/components/settings/settings-row.svelte';
import { Switch } from '$lib/components/ui/switch/index.js';
@@ -7,33 +6,23 @@
id: string;
title: string;
description: string;
- enabledLabel: string;
enabled: boolean;
disabled?: boolean;
children?: import('svelte').Snippet;
}
- let { id, title, description, enabledLabel, enabled = $bindable(), disabled = false, children }: Props = $props();
+ let { id, title, description, enabled = $bindable(), disabled = false, children }: Props = $props();
</script>
<div class="space-y-4">
- <h3 class="text-lg font-medium">{title}</h3>
- <div class="bg-card rounded-lg border shadow-sm">
- <div class="space-y-6 p-6">
- <SettingsRow label={title} {description} contentClass="space-y-4">
- <div class="flex items-center gap-2">
- <Switch id="{id}-enabled" bind:checked={enabled} {disabled} />
- <Label for="{id}-enabled" class="font-normal">
- {enabledLabel}
- </Label>
- </div>
+ <h3 class="text-base font-semibold">{title}</h3>
+ <SettingsRow label={title} {description} layout="inline">
+ <Switch id="{id}-enabled" bind:checked={enabled} {disabled} />
+ </SettingsRow>
- {#if enabled && children}
- <div class="space-y-4 pt-2">
- {@render children()}
- </div>
- {/if}
- </SettingsRow>
+ {#if enabled && children}
+ <div class="border-border/60 space-y-4 border-l-2 pl-5">
+ {@render children()}
</div>
- </div>
+ {/if}
</div>
diff --git a/frontend/src/routes/(app)/settings/timeouts/+page.svelte b/frontend/src/routes/(app)/settings/timeouts/+page.svelte
index bc278a908..b950a7e7f 100644
--- a/frontend/src/routes/(app)/settings/timeouts/+page.svelte
+++ b/frontend/src/routes/(app)/settings/timeouts/+page.svelte
@@ -4,7 +4,6 @@
import settingsStore from '$lib/stores/config-store';
import { m } from '$lib/paraglide/messages';
import { SettingsPageLayout } from '$lib/layouts';
- import SettingsRow from '$lib/components/settings/settings-row.svelte';
import { ClockIcon } from '$lib/icons';
import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';
import { createSettingsForm } from '$lib/utils/settings-form.util';
@@ -58,130 +57,85 @@
<fieldset disabled={isReadOnly} class="relative space-y-8">
<!-- Docker Operations -->
<div class="space-y-4">
- <h3 class="text-lg font-medium">{m.timeouts_docker_operations()}</h3>
- <div class="bg-card rounded-lg border shadow-sm">
- <div class="space-y-6 p-6">
- <SettingsRow label={m.docker_api_timeout()} description={m.docker_api_timeout_description()} contentClass="max-w-xs">
- <TextInputWithLabel
- bind:value={$formInputs.dockerApiTimeout.value}
- error={$formInputs.dockerApiTimeout.error}
- label={m.docker_api_timeout()}
- placeholder="30"
- helpText="Timeout in seconds (1-3600)"
- type="number"
- />
- </SettingsRow>
-
- <div class="border-t pt-6">
- <SettingsRow
- label={m.docker_image_pull_timeout()}
- description={m.docker_image_pull_timeout_description()}
- contentClass="max-w-xs"
- >
- <TextInputWithLabel
- bind:value={$formInputs.dockerImagePullTimeout.value}
- error={$formInputs.dockerImagePullTimeout.error}
- label={m.docker_image_pull_timeout()}
- placeholder="600"
- helpText="Timeout in seconds (30-7200)"
- type="number"
- />
- </SettingsRow>
- </div>
-
- <div class="border-t pt-6">
- <SettingsRow
- label={m.trivy_scan_timeout()}
- description={m.trivy_scan_timeout_description()}
- contentClass="max-w-xs"
- >
- <TextInputWithLabel
- bind:value={$formInputs.trivyScanTimeout.value}
- error={$formInputs.trivyScanTimeout.error}
- label={m.trivy_scan_timeout()}
- placeholder="900"
- helpText="Timeout in seconds (60-14400)"
- type="number"
- />
- </SettingsRow>
- </div>
- </div>
+ <h3 class="text-base font-semibold">{m.timeouts_docker_operations()}</h3>
+ <div class="grid gap-5 sm:grid-cols-2 lg:grid-cols-3">
+ <TextInputWithLabel
+ bind:value={$formInputs.dockerApiTimeout.value}
+ error={$formInputs.dockerApiTimeout.error}
+ label={m.docker_api_timeout()}
+ description={m.docker_api_timeout_description()}
+ placeholder="30"
+ helpText="Timeout in seconds (1-3600)"
+ type="number"
+ />
+ <TextInputWithLabel
+ bind:value={$formInputs.dockerImagePullTimeout.value}
+ error={$formInputs.dockerImagePullTimeout.error}
+ label={m.docker_image_pull_timeout()}
+ description={m.docker_image_pull_timeout_description()}
+ placeholder="600"
+ helpText="Timeout in seconds (30-7200)"
+ type="number"
+ />
+ <TextInputWithLabel
+ bind:value={$formInputs.trivyScanTimeout.value}
+ error={$formInputs.trivyScanTimeout.error}
+ label={m.trivy_scan_timeout()}
+ description={m.trivy_scan_timeout_description()}
+ placeholder="900"
+ helpText="Timeout in seconds (60-14400)"
+ type="number"
+ />
</div>
</div>
<!-- Git Operations -->
<div class="space-y-4">
- <h3 class="text-lg font-medium">{m.timeouts_git_operations()}</h3>
- <div class="bg-card rounded-lg border shadow-sm">
- <div class="space-y-6 p-6">
- <SettingsRow
- label={m.git_operation_timeout()}
- description={m.git_operation_timeout_description()}
- contentClass="max-w-xs"
- >
- <TextInputWithLabel
- bind:value={$formInputs.gitOperationTimeout.value}
- error={$formInputs.gitOperationTimeout.error}
- label={m.git_operation_timeout()}
- placeholder="300"
- helpText="Timeout in seconds (30-3600)"
- type="number"
- />
- </SettingsRow>
- </div>
+ <h3 class="text-base font-semibold">{m.timeouts_git_operations()}</h3>
+ <div class="grid gap-5 sm:grid-cols-2 lg:grid-cols-3">
+ <TextInputWithLabel
+ bind:value={$formInputs.gitOperationTimeout.value}
+ error={$formInputs.gitOperationTimeout.error}
+ label={m.git_operation_timeout()}
+ description={m.git_operation_timeout_description()}
+ placeholder="300"
+ helpText="Timeout in seconds (30-3600)"
+ type="number"
+ />
</div>
</div>
<!-- Network Operations -->
<div class="space-y-4">
- <h3 class="text-lg font-medium">{m.timeouts_network_operations()}</h3>
- <div class="bg-card rounded-lg border shadow-sm">
- <div class="space-y-6 p-6">
- <SettingsRow
- label={m.http_client_timeout()}
- description={m.http_client_timeout_description()}
- contentClass="max-w-xs"
- >
- <TextInputWithLabel
- bind:value={$formInputs.httpClientTimeout.value}
- error={$formInputs.httpClientTimeout.error}
- label={m.http_client_timeout()}
- placeholder="30"
- helpText="Timeout in seconds (5-300)"
- type="number"
- />
- </SettingsRow>
-
- <div class="border-t pt-6">
- <SettingsRow label={m.registry_timeout()} description={m.registry_timeout_description()} contentClass="max-w-xs">
- <TextInputWithLabel
- bind:value={$formInputs.registryTimeout.value}
- error={$formInputs.registryTimeout.error}
- label={m.registry_timeout()}
- placeholder="30"
- helpText="Timeout in seconds (5-300)"
- type="number"
- />
- </SettingsRow>
- </div>
-
- <div class="border-t pt-6">
- <SettingsRow
- label={m.proxy_request_timeout()}
- description={m.proxy_request_timeout_description()}
- contentClass="max-w-xs"
- >
- <TextInputWithLabel
- bind:value={$formInputs.proxyRequestTimeout.value}
- error={$formInputs.proxyRequestTimeout.error}
- label={m.proxy_request_timeout()}
- placeholder="60"
- helpText="Timeout in seconds (10-600)"
- type="number"
- />
- </SettingsRow>
- </div>
- </div>
+ <h3 class="text-base font-semibold">{m.timeouts_network_operations()}</h3>
+ <div class="grid gap-5 sm:grid-cols-2 lg:grid-cols-3">
+ <TextInputWithLabel
+ bind:value={$formInputs.httpClientTimeout.value}
+ error={$formInputs.httpClientTimeout.error}
+ label={m.http_client_timeout()}
+ description={m.http_client_timeout_description()}
+ placeholder="30"
+ helpText="Timeout in seconds (5-300)"
+ type="number"
+ />
+ <TextInputWithLabel
+ bind:value={$formInputs.registryTimeout.value}
+ error={$formInputs.registryTimeout.error}
+ label={m.registry_timeout()}
+ description={m.registry_timeout_description()}
+ placeholder="30"
+ helpText="Timeout in seconds (5-300)"
+ type="number"
+ />
+ <TextInputWithLabel
+ bind:value={$formInputs.proxyRequestTimeout.value}
+ error={$formInputs.proxyRequestTimeout.error}
+ label={m.proxy_request_timeout()}
+ description={m.proxy_request_timeout_description()}
+ placeholder="60"
+ helpText="Timeout in seconds (10-600)"
+ type="number"
+ />
</div>
</div>
</fieldset>
diff --git a/frontend/src/routes/(app)/volumes/[volumeName]/+page.svelte b/frontend/src/routes/(app)/volumes/[volumeName]/+page.svelte
index ee118ae8e..f79662604 100644
--- a/frontend/src/routes/(app)/volumes/[volumeName]/+page.svelte
+++ b/frontend/src/routes/(app)/volumes/[volumeName]/+page.svelte
@@ -85,7 +85,7 @@
<TabbedPageLayout backUrl="/volumes" backLabel={m.volumes_title()} {tabItems} {selectedTab} {onTabChange}>
{#snippet headerInfo()}
<div class="flex flex-col gap-1">
- <h1 class="text-2xl font-bold tracking-tight break-all sm:text-3xl">{volume.name}</h1>
+ <h1 class="text-2xl font-semibold tracking-tight break-all sm:text-3xl">{volume.name}</h1>
<div class="flex flex-wrap items-center gap-2 pt-1">
{#if volume.inUse}
<StatusBadge variant="green" text={m.common_in_use()} />
diff --git a/frontend/src/routes/(auth)/oidc/callback/+page.svelte b/frontend/src/routes/(auth)/oidc/callback/+page.svelte
index 1fe8351c8..bed8546b1 100644
--- a/frontend/src/routes/(auth)/oidc/callback/+page.svelte
+++ b/frontend/src/routes/(auth)/oidc/callback/+page.svelte
@@ -145,7 +145,7 @@
<div class="flex flex-col items-center text-center">
{#if isProcessing}
<Spinner class="text-primary size-12" />
- <h2 class="mt-6 text-2xl font-bold">{m.auth_processing_login()}</h2>
+ <h2 class="mt-6 text-2xl font-semibold">{m.auth_processing_login()}</h2>
<p class="text-muted-foreground mt-2 text-sm">{m.auth_processing_login_description()}</p>
{:else if error}
<div class="text-destructive flex flex-col items-center">
@@ -157,7 +157,7 @@
d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.732-.833-2.5 0L3.341 16.5c-.77.833.192 2.5 1.732 2.5z"
/>
</svg>
- <h2 class="mt-6 text-2xl font-bold">{m.auth_authentication_error_title()}</h2>
+ <h2 class="mt-6 text-2xl font-semibold">{m.auth_authentication_error_title()}</h2>
<p class="mt-2 text-sm">{error}</p>
<p class="text-muted-foreground mt-4 text-xs">{m.auth_redirecting_to_login()}</p>
</div>
diff --git a/frontend/src/routes/(auth)/oidc/login/+page.svelte b/frontend/src/routes/(auth)/oidc/login/+page.svelte
index 87f52f942..ece2abc27 100644
--- a/frontend/src/routes/(auth)/oidc/login/+page.svelte
+++ b/frontend/src/routes/(auth)/oidc/login/+page.svelte
@@ -57,7 +57,7 @@
<div class="flex flex-col items-center text-center">
{#if isRedirecting && !error}
<Spinner class="text-primary size-12" />
- <h2 class="mt-6 text-2xl font-bold">{m.auth_oidc_redirecting_title()}</h2>
+ <h2 class="mt-6 text-2xl font-semibold">{m.auth_oidc_redirecting_title()}</h2>
<p class="text-muted-foreground mt-2 text-sm">{m.auth_oidc_redirecting_description()}</p>
{:else if error}
<div class="text-destructive flex flex-col items-center">
@@ -69,7 +69,7 @@
d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.732-.833-2.5 0L3.341 16.5c-.77.833.192 2.5 1.732 2.5z"
/>
</svg>
- <h2 class="mt-6 text-2xl font-bold">{m.auth_authentication_error_title()}</h2>
+ <h2 class="mt-6 text-2xl font-semibold">{m.auth_authentication_error_title()}</h2>
<p class="mt-2 text-sm">{error}</p>
<p class="text-muted-foreground mt-4 text-xs">{m.auth_redirecting_to_login()}</p>
</div>