Skip to content

style(web): fix inconsistencies in new settings layouts #10177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
extoci wants to merge 3 commits into
base: main
Choose a base branch
from
Open

style(web): fix inconsistencies in new settings layouts #10177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
540ec29
fix(web): make settings rows consistent
extoci Sep 5, 2026
2e683d8
fix(web): avoid settings animation on entry
extoci Sep 5, 2026
8d93ec0
Revert "fix(web): avoid settings animation on entry"
extoci Sep 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/web/src/components/settings/ConnectionsSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ function formatDesktopSshConnectionError(error: unknown): string {
return withoutTaggedErrorPrefix.trim() || fallback;
}

const ENDPOINT_ROW_CLASSNAME = "rounded-xl px-3 py-2.5 sm:px-4";
const ENDPOINT_ROW_CLASSNAME = "px-3 py-2.5 sm:px-4";

type AccessSectionPresentation = "current" | "endpoint-rail";

Expand All @@ -404,7 +404,7 @@ function accessRowClassName(_presentation: AccessSectionPresentation) {

function endpointRowClassName(presentation: AccessSectionPresentation, isAvailable: boolean) {
if (presentation === "endpoint-rail") {
return cn("relative rounded-xl px-3 py-3 sm:px-4", !isAvailable && "bg-muted/15");
return cn("relative px-3 py-3 sm:px-4", !isAvailable && "bg-muted/15");
}

return cn(ENDPOINT_ROW_CLASSNAME, !isAvailable && "bg-muted/24");
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/settings/SettingsPanels.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2603,7 +2603,7 @@ export function GeneralSettingsPanel() {

<SettingsRow
serverScoped
className="bg-muted/20 sm:pl-9"
className="bg-muted/20"
title={searchableSetting("start-from-origin").title}
description="Creates the worktree from the latest matching branch on origin instead of your local branch."
resetAction={
Expand Down
9 changes: 2 additions & 7 deletions apps/web/src/components/settings/SourceControlSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,12 +279,7 @@ function DiscoveryItemRow({
}, [item.kind, searchTargetId]);

return (
<div
className={cn(
"rounded-xl transition-colors hover:bg-muted/20",
isVcsNotReady(item) && "opacity-80",
)}
>
<div className={cn("transition-colors hover:bg-muted/20", isVcsNotReady(item) && "opacity-80")}>
<div className="px-3 py-3 sm:px-4">
<div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
<div className="min-w-0 flex-1 space-y-1">
Expand Down Expand Up @@ -431,7 +426,7 @@ function SourceControlSectionSkeleton({
return (
<SettingsSection title={title} headerAction={headerAction}>
{SOURCE_CONTROL_SKELETON_ROWS.map((row) => (
<div key={row} className="rounded-xl px-3 py-3 sm:px-4">
<div key={row} className="px-3 py-3 sm:px-4">
<div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
<div className="min-w-0 flex-1 space-y-2">
<div className="flex items-center gap-2">
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/components/settings/itemRows.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/** Direct row in a settings section. Whitespace, rather than rules, separates peers. */
export const ITEM_ROW_CLASSNAME = "rounded-xl px-3 py-3 sm:px-4";
/** Direct row in a grouped settings section. The parent owns borders and separators. */
export const ITEM_ROW_CLASSNAME = "px-3 py-3 sm:px-4";

export const ITEM_ROW_INNER_CLASSNAME =
"flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between";
Loading