Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix: stack Color Theme settings rows at narrow container widths (#5217)

Peter Chinmana2bf97d4298d
diff --git a/apps/web/src/features/settings/Appearance.tsx b/apps/web/src/features/settings/Appearance.tsx
index b27b90849b..b6d941f0ca 100644
--- a/apps/web/src/features/settings/Appearance.tsx
+++ b/apps/web/src/features/settings/Appearance.tsx
@@ -237,7 +237,11 @@ function ThemeSelectorRow(props: {
return (
<>
- <SettingsRow label={props.label} description={props.description}>
+ <SettingsRow
+ label={props.label}
+ description={props.description}
+ stackOnNarrow
+ >
<InterfaceThemeSelect
value={props.value}
filter={props.filter}
@@ -609,6 +613,7 @@ function ActiveThemeRow() {
<SettingsRow
label="Active theme"
description="Match your system, or always use light or dark."
+ stackOnNarrow
>
<div class="flex items-center gap-1">
<ActiveThemeSelect
@@ -649,7 +654,9 @@ export function Appearance() {
<div class="h-full" style={{ '--b4l': 'var(--b3l)' }}>
<SettingsPage title="Appearance">
<SettingsSection title="Color Theme">
- <SettingsCard>
+ {/* Establish a container so the rows can stack (label/description over
+ the picker) when the panel is narrower than 460px. */}
+ <SettingsCard class="@container">
{/* Active theme: pin a specific theme by name, or follow the OS. */}
<ActiveThemeRow />
diff --git a/apps/web/src/features/settings/primitives.tsx b/apps/web/src/features/settings/primitives.tsx
index 6848812e75..135d018ed1 100644
--- a/apps/web/src/features/settings/primitives.tsx
+++ b/apps/web/src/features/settings/primitives.tsx
@@ -120,13 +120,30 @@ export function SettingsRow(props: {
align?: 'center' | 'start';
/** Hide the description on mobile, where the row is too cramped for it. */
hideDescriptionOnMobile?: boolean;
+ /**
+ * Below a 460px container width, stack the control on its own row beneath
+ * the label/description instead of keeping it in a right-hand column.
+ * Requires an ancestor carrying `@container`.
+ */
+ stackOnNarrow?: boolean;
class?: string;
}) {
return (
<div
class={cn(
- 'flex justify-between gap-4 px-6 py-3.5 min-h-[60px]',
- props.align === 'start' ? 'items-start' : 'items-center',
+ 'flex gap-4 px-6 py-3.5 min-h-[60px]',
+ props.stackOnNarrow
+ ? 'flex-col gap-1.5 @[460px]:flex-row @[460px]:justify-between @[460px]:gap-4'
+ : 'justify-between',
+ // Cross-axis alignment only makes sense once the row is horizontal, so
+ // gate it behind the container width when stacking.
+ props.align === 'start'
+ ? props.stackOnNarrow
+ ? '@[460px]:items-start'
+ : 'items-start'
+ : props.stackOnNarrow
+ ? '@[460px]:items-center'
+ : 'items-center',
props.class
)}
>
@@ -144,7 +161,14 @@ export function SettingsRow(props: {
</Show>
</div>
<Show when={props.children}>
- <div class="shrink-0 flex items-center justify-end gap-2 text-right">
+ <div
+ class={cn(
+ 'flex items-center gap-2',
+ props.stackOnNarrow
+ ? '@[460px]:shrink-0 @[460px]:justify-end @[460px]:text-right'
+ : 'shrink-0 justify-end text-right'
+ )}
+ >
{props.children}
</div>
</Show>