diff --git a/ui/docs/design-system/settings-design.md b/ui/docs/design-system/settings-design.md index d4c255f196de..a3aa0381ff20 100644 --- a/ui/docs/design-system/settings-design.md +++ b/ui/docs/design-system/settings-design.md @@ -1,6 +1,6 @@ # Settings Design Language -Every settings surface (the `/settings` takeover pages plus the Plugins/Skills hubs) uses one structural pattern. Styles live in `ui/src/styles/settings.css`; templates are built through the helpers in `ui/src/components/settings-ui.ts`. +Every settings surface (the `/settings` takeover pages plus the Plugins/Skills hubs) uses one structural pattern. Workspace styles live in `ui/src/styles/settings.css`, while controls shared with startup surfaces live in `ui/src/styles/settings-controls.css`; templates are built through the helpers in `ui/src/components/settings-ui.ts`. ## Anatomy diff --git a/ui/src/components/form-controls.browser.test.ts b/ui/src/components/form-controls.browser.test.ts index 60334da8354f..bcfac9f83f9b 100644 --- a/ui/src/components/form-controls.browser.test.ts +++ b/ui/src/components/form-controls.browser.test.ts @@ -26,6 +26,7 @@ function readUiCss(): string { "ui/src/styles/layout.css", "ui/src/styles/layout.mobile.css", "ui/src/styles/components.css", + "ui/src/styles/settings-controls.css", "ui/src/styles/settings.css", "ui/src/styles/config.css", "ui/src/styles/usage.css", diff --git a/ui/src/components/select-picker.ts b/ui/src/components/select-picker.ts index 19766a803e02..9323cbc7c3da 100644 --- a/ui/src/components/select-picker.ts +++ b/ui/src/components/select-picker.ts @@ -1,5 +1,6 @@ import { html, nothing } from "lit"; import "./web-awesome-select.ts"; +import "../styles/select-picker.css"; export type PickerOption = { value: string; diff --git a/ui/src/components/settings-ui.ts b/ui/src/components/settings-ui.ts index 10eac794eb23..007e42557d63 100644 --- a/ui/src/components/settings-ui.ts +++ b/ui/src/components/settings-ui.ts @@ -1,7 +1,7 @@ // Settings design-language primitives. Every settings surface builds its // layout through these helpers so pages cannot drift back into bespoke -// card/pill markup. Styles live in ui/src/styles/settings.css; rules in -// ui/docs/settings-design.md. +// card/pill markup. Styles live in ui/src/styles/settings.css and the shared +// ui/src/styles/settings-controls.css; rules in ui/docs/design-system/settings-design.md. import "@awesome.me/webawesome/dist/components/radio/radio.js"; import "@awesome.me/webawesome/dist/components/radio-group/radio-group.js"; import "@awesome.me/webawesome/dist/components/switch/switch.js"; diff --git a/ui/src/components/settings-workspace.ts b/ui/src/components/settings-workspace.ts index fceb5b2a621f..6757eeb6d395 100644 --- a/ui/src/components/settings-workspace.ts +++ b/ui/src/components/settings-workspace.ts @@ -2,6 +2,7 @@ // section navigation lives in the takeover sidebar (settings-sidebar.ts). import { html } from "lit"; import { ifDefined } from "lit/directives/if-defined.js"; +import "../styles/settings.css"; export function renderSettingsWorkspace( body: unknown, diff --git a/ui/src/pages/chat/chat-responsive.browser.test.ts b/ui/src/pages/chat/chat-responsive.browser.test.ts index 92f83f797b79..ad1cd2056131 100644 --- a/ui/src/pages/chat/chat-responsive.browser.test.ts +++ b/ui/src/pages/chat/chat-responsive.browser.test.ts @@ -930,9 +930,9 @@ describeBrowserLayout.concurrent("chat responsive browser layout", () => { try { const splitViewCss = readStyleSheet("ui/src/styles/chat/split-view.css"); const boardCss = readStyleSheet("ui/src/styles/chat/board.css"); - const settingsCss = readStyleSheet("ui/src/styles/settings.css"); + const settingsControlsCss = readStyleSheet("ui/src/styles/settings-controls.css"); await page.setContent( - `
+ `