From 93f30caaa4ac788b3f69cdf635f4de58c30d8011 Mon Sep 17 00:00:00 2001
From: usrnk1 <7547651+usrnk1@users.noreply.github.com>
Date: Wed, 4 Nov 2026 16:24:32 +0100
Subject: [PATCH] feat(app): tweak interface layout with simpler previews
(#61685)
---
packages/app/e2e/regression/home.spec.ts | 2 +-
packages/app/e2e/regression/settings.spec.ts | 2 +-
packages/app/src/runtime/i18n/en.ts | 8 +-
packages/app/src/settings/general/general.tsx | 2 +-
.../src/settings/general/interface-mode.css | 298 +++++++-----------
.../src/settings/general/interface-mode.tsx | 212 ++++---------
packages/app/src/settings/row.tsx | 3 +-
packages/app/src/settings/settings.css | 4 +
8 files changed, 186 insertions(+), 345 deletions(-)
diff --git a/packages/app/e2e/regression/home.spec.ts b/packages/app/e2e/regression/home.spec.ts
index dee6a3655ce..4c41157822a 100644
--- a/packages/app/e2e/regression/home.spec.ts
+++ b/packages/app/e2e/regression/home.spec.ts
@@ -30,7 +30,7 @@ test("Home keeps the session list in every interface mode", async ({ page }) =>
await page.keyboard.press("Control+,")
const settings = page.getByTestId("settings-screen")
const option = settings.getByRole("radio", { name: mode, exact: true })
- await settings.getByRole("group", { name: "Interface", exact: true }).getByText(mode, { exact: true }).click()
+ await settings.getByRole("group", { name: "Interface layout", exact: true }).getByText(mode, { exact: true }).click()
await expect(option).toBeChecked()
await settings.getByRole("button", { name: "Back to app", exact: true }).click()
await expect(page).toHaveURL("/")
diff --git a/packages/app/e2e/regression/settings.spec.ts b/packages/app/e2e/regression/settings.spec.ts
index c8cf05c20d6..0083ef533ae 100644
--- a/packages/app/e2e/regression/settings.spec.ts
+++ b/packages/app/e2e/regression/settings.spec.ts
@@ -1861,7 +1861,7 @@ test("a pairing code with several addresses keeps the first one that works with
test("the Side tabs interface mode switches to vertical tabs and survives reload", async ({ page }) => {
const { settings } = await open(page)
- const layout = settings.getByRole("group", { name: "Interface" })
+ const layout = settings.getByRole("group", { name: "Interface layout", exact: true })
await expect(layout.getByRole("radio", { name: "Top tabs", exact: true })).toBeChecked()
await layout.getByText("Side tabs", { exact: true }).click()
await expect(layout.getByRole("radio", { name: "Side tabs", exact: true })).toBeChecked()
diff --git a/packages/app/src/runtime/i18n/en.ts b/packages/app/src/runtime/i18n/en.ts
index 575e88fbf78..2296d5cd906 100644
--- a/packages/app/src/runtime/i18n/en.ts
+++ b/packages/app/src/runtime/i18n/en.ts
@@ -867,15 +867,11 @@ export const dict = {
"settings.appearance.row.tabs.description": "Choose how session tabs are arranged",
"settings.appearance.row.tabs.horizontal": "Horizontal",
"settings.appearance.row.tabs.vertical": "Vertical",
- "settings.general.row.interfaceMode.title": "Interface",
+ "settings.general.row.interfaceMode.title": "Interface layout",
+ "settings.general.row.interfaceMode.description": "Choose how you switch between sessions and keep track of what's running",
"settings.general.row.interfaceMode.top": "Top tabs",
- "settings.general.row.interfaceMode.top.description": "Browser-style tabs across the top of the window.",
"settings.general.row.interfaceMode.side": "Side tabs",
- "settings.general.row.interfaceMode.side.description": "Browser-style tabs in a sidebar.",
"settings.general.row.interfaceMode.inbox": "Inbox",
- "settings.general.row.interfaceMode.inbox.description":
- "Every session across your servers, sorted by what needs you next.",
- "settings.general.row.interfaceMode.experimental": "Experimental",
"settings.appearance.row.zoom.title": "Zoom",
"settings.appearance.row.zoom.description": "Make text and controls larger across the app",
"settings.appearance.row.reduceMotion.title": "Reduce motion",
diff --git a/packages/app/src/settings/general/general.tsx b/packages/app/src/settings/general/general.tsx
index b60849019d3..effd72a3cef 100644
--- a/packages/app/src/settings/general/general.tsx
+++ b/packages/app/src/settings/general/general.tsx
@@ -263,8 +263,8 @@ export const SettingsGeneral: Component = () => {
const GeneralSection = () => (
{language.t("settings.general.section.general")}
-
+
diff --git a/packages/app/src/settings/general/interface-mode.css b/packages/app/src/settings/general/interface-mode.css
index e78230a9a85..b2516d881f9 100644
--- a/packages/app/src/settings/general/interface-mode.css
+++ b/packages/app/src/settings/general/interface-mode.css
@@ -1,190 +1,129 @@
[data-component="interface-mode"] {
- display: grid;
- grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
+ display: flex;
gap: 12px;
min-width: 0;
margin: 0;
padding: 0;
border: 0;
-
- [data-slot="interface-mode-option"] {
- position: relative;
- display: flex;
- min-width: 0;
- flex-direction: column;
- gap: 12px;
- padding: 12px;
- border-radius: 8px;
- background-color: var(--v2-background-bg-layer-01);
- box-shadow: inset 0 0 0 0.5px var(--v2-border-border-muted);
- cursor: pointer;
- transition: box-shadow 120ms ease;
-
- &:hover {
- box-shadow: inset 0 0 0 1px var(--v2-border-border-strong);
- }
-
- &[data-checked] {
- box-shadow: inset 0 0 0 1.5px var(--v2-border-border-focus);
- }
-
- &:has(input:focus-visible) {
- outline: 2px solid var(--v2-border-border-focus);
- outline-offset: 2px;
- }
-
- input {
- position: absolute;
- inset: 0;
- margin: 0;
- opacity: 0;
- pointer-events: none;
- }
- }
-
- [data-slot="interface-mode-copy"] {
- display: flex;
- flex-direction: column;
- gap: 4px;
- padding-inline: 2px;
- }
-
- [data-slot="interface-mode-title"] {
- display: flex;
- align-items: center;
- gap: 8px;
- font-size: 13px;
- font-weight: 530;
- line-height: var(--line-height-compact);
- letter-spacing: -0.04px;
- color: var(--v2-text-text-base);
- }
-
- [data-slot="interface-mode-radio"] {
- flex-shrink: 0;
- box-sizing: border-box;
- width: 14px;
- height: 14px;
- border: 1px solid var(--v2-border-border-strong);
- border-radius: 50%;
- transition: border 120ms ease;
- }
-
- [data-checked] [data-slot="interface-mode-radio"] {
- border: 4px solid var(--v2-background-bg-accent);
- }
-
- [data-slot="interface-mode-badge"] {
- padding: 0 5px;
- border-radius: 4px;
- font-size: 11px;
- font-weight: 500;
- line-height: var(--line-height-compact);
- color: var(--v2-text-text-muted);
- background-color: var(--v2-background-bg-layer-03);
- }
-
- [data-slot="interface-mode-description"] {
- padding-inline-start: 22px;
- font-size: 13px;
- font-weight: 440;
- line-height: var(--line-height-base);
- color: var(--v2-text-text-muted);
- }
}
-[data-slot="interface-mode-preview"] {
+[data-slot="interface-mode-option"] {
--preview-fill: var(--v2-background-bg-layer-02);
--preview-ink: var(--v2-background-bg-layer-03);
--preview-ink-strong: var(--v2-background-bg-layer-04);
+ position: relative;
display: flex;
- flex-direction: column;
overflow: hidden;
- aspect-ratio: 16 / 9;
+ /* A fixed size keeps the row from resizing when the chosen layout changes the panel width. */
+ width: 120px;
+ min-width: 0;
+ flex-direction: column;
+ box-sizing: border-box;
border: 1px solid var(--v2-border-border-base);
- border-radius: 6px;
- background-color: var(--v2-background-bg-base);
+ border-radius: 8px;
+ background-color: var(--v2-background-bg-layer-02);
+ cursor: pointer;
+ transition:
+ border-color 120ms ease,
+ box-shadow 120ms ease;
- span,
- i {
+ &:hover {
+ border-color: var(--v2-border-border-strong);
+ }
+
+ &[data-checked] {
+ --preview-ink-strong: color-mix(in srgb, var(--v2-background-bg-accent) 70%, transparent);
+ border-color: var(--v2-border-border-focus);
+ box-shadow: inset 0 0 0 1px var(--v2-border-border-focus);
+ }
+
+ &:has(input:focus-visible) {
+ outline: 2px solid var(--v2-border-border-focus);
+ outline-offset: 2px;
+ }
+
+ input {
+ position: absolute;
+ inset: 0;
+ margin: 0;
+ opacity: 0;
+ pointer-events: none;
+ }
+
+ :where(span, i) {
display: block;
flex-shrink: 0;
}
+}
- [data-slot="preview-body"] {
- display: flex;
- min-height: 0;
- min-width: 0;
- flex: 1;
+[data-slot="interface-mode-sketch"] {
+ display: flex;
+ overflow: hidden;
+ height: 52px;
+ margin: 10px 10px 0;
+ border: 0.5px solid var(--v2-border-border-base);
+ border-bottom: 0;
+ border-radius: 4px 4px 0 0;
+ background-color: var(--v2-background-bg-base);
+
+ &[data-mode="top"] {
+ flex-direction: column;
}
- [data-slot="preview-line"] {
- height: 3px;
- border-radius: 1.5px;
- background-color: var(--preview-ink);
- }
-
- [data-slot="preview-tab"] {
- display: flex;
- align-items: center;
- gap: 4px;
- padding: 3px;
- border-radius: 2px;
-
- &[data-active] {
- background-color: var(--preview-fill);
- }
-
- i {
- width: 5px;
- height: 5px;
- border-radius: 1px;
- background-color: var(--preview-ink-strong);
- }
-
- span {
- height: 3px;
- border-radius: 1.5px;
- background-color: var(--preview-ink);
- }
- }
-
- [data-slot="preview-tabs"] {
+ [data-slot="preview-strip"] {
display: flex;
gap: 3px;
- padding: 4px 6px;
+ padding: 4px 5px;
border-bottom: 0.5px solid var(--v2-border-border-base);
background-color: var(--v2-overlay-simple-overlay-pressed);
[data-slot="preview-tab"] {
- width: 22%;
+ width: 18px;
}
}
[data-slot="preview-rail"] {
display: flex;
- width: 24%;
+ width: 28px;
flex-direction: column;
- gap: 3px;
- padding: 6px 4px;
+ gap: 4px;
+ padding: 6px 5px;
border-inline-end: 0.5px solid var(--v2-border-border-base);
background-color: var(--v2-overlay-simple-overlay-pressed);
}
- [data-slot="preview-rail-heading"] {
- width: 30%;
- height: 3px;
- margin: 4px 3px 1px;
- border-radius: 1.5px;
- background-color: var(--preview-ink-strong);
- opacity: 0.6;
+ [data-slot="preview-tab"] {
+ height: 5px;
+ border-radius: 2px;
+ background-color: color-mix(in srgb, var(--preview-ink-strong) 45%, transparent);
- &:first-child {
- margin-top: 0;
+ &[data-active] {
+ background-color: var(--preview-ink-strong);
}
}
- [data-slot="preview-tab"] i[data-status] {
+ &[data-mode="inbox"] [data-slot="preview-tab"] {
+ display: flex;
+ align-items: center;
+ gap: 2px;
+ background-color: transparent;
+
+ &::after {
+ content: "";
+ height: 3px;
+ flex: 1;
+ border-radius: 1.5px;
+ background-color: color-mix(in srgb, var(--preview-ink-strong) 45%, transparent);
+ }
+
+ &[data-active]::after {
+ background-color: var(--preview-ink-strong);
+ }
+ }
+
+ i[data-status] {
+ width: 4px;
+ height: 4px;
border-radius: 50%;
&[data-status="approval"] {
@@ -200,60 +139,51 @@
}
}
- [data-slot="preview-main"] {
+ [data-slot="preview-page"] {
display: flex;
min-width: 0;
+ min-height: 0;
flex: 1;
flex-direction: column;
gap: 4px;
- padding: 6px 8px;
+ padding: 6px;
}
- [data-slot="preview-toolbar"] {
- display: flex;
- justify-content: flex-end;
- gap: 3px;
- margin-bottom: 3px;
+ [data-slot="preview-line"] {
+ width: 80%;
+ height: 3px;
+ border-radius: 1.5px;
+ background-color: var(--preview-ink);
- i {
- width: 6px;
- height: 6px;
- border-radius: 1.5px;
- background-color: var(--preview-ink-strong);
+ & + [data-slot="preview-line"] {
+ width: 56%;
}
}
[data-slot="preview-composer"] {
- display: flex;
- align-items: center;
- justify-content: flex-end;
- gap: 3px;
- height: 12px;
+ height: 8px;
margin-top: auto;
- padding-inline: 3px;
- border-radius: 5px;
+ border-radius: 3px;
background-color: var(--preview-fill);
box-shadow: inset 0 0 0 0.5px var(--v2-border-border-base);
-
- i {
- width: 5px;
- height: 5px;
- border-radius: 1px;
- background-color: var(--preview-ink-strong);
- }
- }
-
- [data-slot="preview-panel"] {
- display: flex;
- width: 26%;
- flex-direction: column;
- gap: 4px;
- padding: 8px 6px;
- border-inline-start: 0.5px solid var(--v2-border-border-base);
- background-color: var(--v2-overlay-simple-overlay-pressed);
}
}
-[data-checked] [data-slot="interface-mode-preview"] {
- --preview-ink-strong: color-mix(in srgb, var(--v2-background-bg-accent) 70%, transparent);
+[data-slot="interface-mode-name"] {
+ padding: 6px 10px;
+ border-top: 0.5px solid var(--v2-border-border-base);
+ font-size: 12px;
+ font-weight: var(--font-weight-medium);
+ line-height: var(--line-height-compact);
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ color: var(--v2-text-text-muted);
+ background-color: var(--v2-background-bg-base);
+ transition: color 120ms ease;
+
+ [data-slot="interface-mode-option"]:hover &,
+ [data-checked] & {
+ color: var(--v2-text-text-base);
+ }
}
diff --git a/packages/app/src/settings/general/interface-mode.tsx b/packages/app/src/settings/general/interface-mode.tsx
index 6cba5f6637c..5d7bf8258a3 100644
--- a/packages/app/src/settings/general/interface-mode.tsx
+++ b/packages/app/src/settings/general/interface-mode.tsx
@@ -1,6 +1,7 @@
-import { For, Match, Show, Switch, createUniqueId } from "solid-js"
+import { For, Match, Switch, createUniqueId } from "solid-js"
import { useLanguage } from "@/runtime/i18n/language"
import { type TabLayout, useSettings } from "@/settings/model"
+import { SettingsRow } from "@/settings/row"
import "./interface-mode.css"
const modes = [
@@ -15,159 +16,68 @@ export function InterfaceModeSetting() {
const id = createUniqueId()
return (
-
- )
-}
-
-// The modes differ only in where sessions are listed, so every preview shares one workspace.
-function TopTabsPreview() {
- return (
- <>
-
-
- {(width, index) => (
-
-
-
-
+ {language.t(`settings.general.row.interfaceMode.${mode.id}`)}
+
)}
-
-
- >
+
+
)
}
-function SideTabsPreview() {
- return (
-
-
-
- {(width, index) => (
-
-
-
-
- )}
-
-
-
-
- )
-}
-
-// Mirrors the inbox: sessions that need you, then finished work, then sessions still running.
-const inboxSections = [
- { rows: [{ width: 68, status: "approval" }] },
- {
- rows: [
- { width: 56, status: "done" },
- { width: 72, status: "done" },
- ],
- },
- {
- rows: [
- { width: 48, status: "working" },
- { width: 62, status: "working" },
- ],
- },
-] as const
-
-function InboxPreview() {
- return (
-
-
-
- {(section, sectionIndex) => (
- <>
-
-
- {(row, index) => (
-
-
-
-
- )}
-
- >
- )}
-
-
-
-
- )
-}
-
-function PreviewWorkspace() {
- return (
-
-
-
-
-
-
-
-
-
- {(width) => }
-
-
-
-
-
-
-
-
- {(width) => }
-
-
-
- )
-}
+// Mirrors the inbox: a session that needs you, then finished work, then sessions still running.
+const inboxRows = ["approval", "done", "working", "working"] as const
diff --git a/packages/app/src/settings/row.tsx b/packages/app/src/settings/row.tsx
index 11023729529..c5fdd8dfc6d 100644
--- a/packages/app/src/settings/row.tsx
+++ b/packages/app/src/settings/row.tsx
@@ -5,11 +5,12 @@ export interface SettingsRowProps {
title: string | JSX.Element
description: string | JSX.Element
children: JSX.Element
+ align?: "start"
}
export const SettingsRow: Component = (props) => {
return (
-
+
{props.title}
{props.description}
diff --git a/packages/app/src/settings/settings.css b/packages/app/src/settings/settings.css
index 3ebbaf7dbc4..7e871fdfefe 100644
--- a/packages/app/src/settings/settings.css
+++ b/packages/app/src/settings/settings.css
@@ -816,6 +816,10 @@
border-bottom: 0.5px solid var(--v2-border-border-base);
}
+[data-component="settings-row"][data-align="start"] {
+ align-items: flex-start;
+}
+
[data-component="settings-row"]:last-child {
border-bottom: none;
}