Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/DiffPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ export default function DiffPanel({
<ComboboxEmpty>No matching refs.</ComboboxEmpty>
<ComboboxList className="max-h-64 min-w-0 overflow-x-hidden">
<ComboboxItem
className="h-8 w-full min-w-0 grid-cols-[1rem_minmax(0,1fr)] py-0"
className="w-full min-w-0 grid-cols-[1rem_minmax(0,1fr)]"
contentClassName="w-full min-w-0 overflow-hidden"
value={AUTOMATIC_BASE_REF}
>
Expand All @@ -786,7 +786,7 @@ export default function DiffPanel({
return (
<ComboboxItem
key={choice.id}
className="h-8 w-full min-w-0 grid-cols-[1rem_minmax(0,1fr)] py-0"
className="w-full min-w-0 grid-cols-[1rem_minmax(0,1fr)]"
contentClassName="w-full min-w-0 overflow-hidden"
value={item}
>
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/components/LegacySidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2758,7 +2758,7 @@ function ProjectSortMenu({
>
{(Object.entries(SIDEBAR_SORT_LABELS) as Array<[SidebarProjectSortOrder, string]>).map(
([value, label]) => (
<MenuRadioItem key={value} value={value} className="min-h-7 py-1 sm:text-xs">
<MenuRadioItem key={value} value={value}>
{label}
</MenuRadioItem>
),
Expand All @@ -2778,7 +2778,7 @@ function ProjectSortMenu({
{(
Object.entries(SIDEBAR_THREAD_SORT_LABELS) as Array<[SidebarThreadSortOrder, string]>
).map(([value, label]) => (
<MenuRadioItem key={value} value={value} className="min-h-7 py-1 sm:text-xs">
<MenuRadioItem key={value} value={value}>
{label}
</MenuRadioItem>
))}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4491,7 +4491,7 @@ export default function Sidebar() {
key={item.value}
hideIndicator
value={item}
className="h-8 min-h-8 py-0 font-medium"
className="font-medium"
contentClassName="flex min-w-0 items-center gap-2"
onContextMenu={(event) => {
if (project) handleProjectSettings(event, project);
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/chat/ChatComposer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1164,7 +1164,7 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
const option = runtimeModeConfig[mode];
const OptionIcon = option.icon;
return (
<SelectItem key={mode} value={mode} hideIndicator className="min-w-64 py-2">
<SelectItem key={mode} value={mode} hideIndicator className="min-w-64">
<div className="flex min-w-0 items-center gap-3">
<div className="grid min-w-0 flex-1 gap-0.5">
<span className="inline-flex items-center gap-1.5 font-medium text-foreground">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ export function PullRequestCandidatePicker<T>({
index={index}
value={keys[index]}
disabled={disabled}
className="min-h-0 py-1.5 text-xs sm:min-h-0 sm:text-xs"
contentClassName="flex min-w-0 items-center gap-2"
>
{children(candidate)}
Expand Down
12 changes: 4 additions & 8 deletions apps/web/src/components/settings/KeybindingsSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ function WhenVariableSelect({
</SelectTrigger>
<SelectContent alignItemWithTrigger={false} matchTriggerWidth={false} className="max-h-72">
{options.map((option) => (
<SelectItem key={option} value={option} className="min-h-7 w-full py-1 text-[12px]">
<SelectItem key={option} value={option} className="w-full">
<span className="truncate">{option}</span>
</SelectItem>
))}
Expand Down Expand Up @@ -530,12 +530,8 @@ function WhenExpressionNodeEditor({
<SelectValue />
</SelectTrigger>
<SelectContent alignItemWithTrigger={false} matchTriggerWidth={false}>
<SelectItem value="and" className="min-h-7 py-1 text-[12px]">
and
</SelectItem>
<SelectItem value="or" className="min-h-7 py-1 text-[12px]">
or
</SelectItem>
<SelectItem value="and">and</SelectItem>
<SelectItem value="or">or</SelectItem>
</SelectContent>
</Select>
<Button type="button" variant="outline" size="compact" onClick={addCondition}>
Expand Down Expand Up @@ -1145,7 +1141,7 @@ function NewKeybindingCommandSelect({
</SelectTrigger>
<SelectContent alignItemWithTrigger={false} matchTriggerWidth={false} className="max-h-72">
{commandOptions.map((command) => (
<SelectItem key={command} value={command} className="min-h-7 w-full py-1 text-[12px]">
<SelectItem key={command} value={command} className="w-full">
<span className="truncate">{commandLabel(command)}</span>
</SelectItem>
))}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
const option = runtimeModeConfig[mode];
const Icon = option.icon;
return (
<SelectItem key={mode} value={mode} className="min-w-64 py-2">
<SelectItem key={mode} value={mode} className="min-w-64">
<div className="grid gap-0.5">
<span className="inline-flex items-center gap-1.5 font-medium">
<Icon className="size-3.5 shrink-0 text-muted-foreground" />
Expand Down
2 changes: 1 addition & 1 deletion scripts/lint-restyle-ceiling.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import * as NodeURL from "node:url";
// components/ui exports are migrated to variants (see vite.config.ts). This gate keeps the
// count from growing: CI fails when findings exceed the ceiling. Lower the ceiling when you
// migrate a file, and delete this script when the rule becomes an error.
export const RESTYLE_CEILING = 737;
export const RESTYLE_CEILING = 717;

const RULE = "shadcn(no-restyle)";

Expand Down
Loading