Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
7 changes: 5 additions & 2 deletions apps/web/src/components/CommandPalette.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ import { orderItemsByPreferredIds, sortLogicalProjectsForSidebar } from "./Sideb
import { resolveEnvironmentOptionLabel } from "./BranchToolbar.logic";
import { CommandPaletteContent } from "./CommandPaletteContent";
import {
CommandPaletteTitleIcon,
CommandPaletteVirtualizedResults,
scrollCommandPaletteRowIntoView,
} from "./CommandPaletteResults";
Expand Down Expand Up @@ -3559,7 +3560,9 @@ function OpenCommandPaletteDialog(props: {
{newProjectPathPreview !== null ? (
<div className="p-2 pb-0">
<div className="flex min-h-8 items-center gap-2 rounded-sm px-2 py-1.5">
<FolderGit2Icon className={ITEM_ICON_CLASS} />
<CommandPaletteTitleIcon>
<FolderGit2Icon className={ITEM_ICON_CLASS} />
</CommandPaletteTitleIcon>
<span className="flex min-w-0 flex-1 flex-col">
<span className="truncate text-foreground text-sm">
{newProjectName.length > 0 ? newProjectName : "New project"}
Expand All @@ -3578,7 +3581,7 @@ function OpenCommandPaletteDialog(props: {
<div className="p-2 pb-0">
<div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Repository</div>
<div className="flex min-h-8 items-center gap-2 rounded-sm px-2 py-1.5">
{remoteProjectContext.icon}
<CommandPaletteTitleIcon>{remoteProjectContext.icon}</CommandPaletteTitleIcon>
<span className="flex min-w-0 flex-1 flex-col">
<span className="truncate text-foreground text-sm">{remoteProjectContext.title}</span>
<span className="truncate text-muted-foreground/85 text-xs">
Expand Down
10 changes: 7 additions & 3 deletions apps/web/src/components/CommandPaletteResults.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type ResolvedKeybindingsConfig } from "@t3tools/contracts";
import { LegendList, type LegendListRef } from "@legendapp/list/react";
import { ChevronRightIcon } from "lucide-react";
import { type RefObject, useCallback, useState } from "react";
import { type ReactNode, type RefObject, useCallback, useState } from "react";
import { cn } from "~/lib/utils";
import { shortcutLabelForCommand } from "../keybindings";
import {
Expand Down Expand Up @@ -155,12 +155,16 @@ export function CommandPaletteVirtualizedResults(props: CommandPaletteVirtualize
);
}

export function CommandPaletteTitleIcon(props: { children: ReactNode }) {
return <span className="flex h-5 shrink-0 items-center self-start pt-0.5">{props.children}</span>;
}

function DisabledCommandPaletteResultRow(props: {
item: CommandPaletteActionItem | CommandPaletteSubmenuItem;
}) {
return (
<div className="flex min-h-8 select-none items-center gap-2 rounded-sm px-2 py-1.5 text-base opacity-64 sm:min-h-7 sm:text-sm">
{props.item.icon}
<CommandPaletteTitleIcon>{props.item.icon}</CommandPaletteTitleIcon>
{props.item.description || props.item.threadContentMatch ? (
<span className="flex min-w-0 flex-1 flex-col">
<span className="flex min-w-0 items-center gap-1.5 text-sm text-foreground">
Expand Down Expand Up @@ -210,7 +214,7 @@ function CommandPaletteResultRow(props: {
props.onExecuteItem(props.item);
}}
>
{props.item.icon}
<CommandPaletteTitleIcon>{props.item.icon}</CommandPaletteTitleIcon>
{props.item.description || props.item.threadContentMatch ? (
<span className="flex min-w-0 flex-1 flex-col">
<span className="flex min-w-0 items-center gap-1.5 text-sm text-foreground">
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 @@ -504,7 +504,7 @@ function SidebarThreadTooltip({
{branchMismatch ? (
<div className="flex min-w-0 items-start gap-2 text-warning">
<CircleAlertIcon aria-hidden className="mt-0.5 size-3 shrink-0 stroke-current" />
<div className="min-w-0 flex-1 wrap-break-word leading-5">
<div className="min-w-0 flex-1 wrap-break-word">
You're currently checked out on another branch.
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/chat/ThreadDetailsPrRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ export function ThreadDetailsPrRow({
{detail.isDraft && conflicting ? (
<div className="flex min-w-0 items-start gap-2 text-destructive">
<TriangleAlertIcon aria-hidden className="mt-0.5 size-3 shrink-0 stroke-current" />
<div className="min-w-0 flex-1 wrap-break-word leading-5">
<div className="min-w-0 flex-1 wrap-break-word">
Merge conflicts with {detail.baseBranch}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/diffs/DiffCommentAnnotation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export function DiffCommentAnnotation({
contentEditable={false}
onPointerDown={(event) => event.stopPropagation()}
>
<MessageCircle className="mt-0.5 size-3.5 shrink-0 text-primary/70" aria-hidden="true" />
<MessageCircle className="size-3.5 h-5 shrink-0 text-primary/70" aria-hidden="true" />
<p className="min-w-0 flex-1 whitespace-pre-wrap text-sm leading-5">{displayedText}</p>
{onDelete ? (
<span className="-my-1 -mr-1 flex shrink-0 opacity-0 transition-opacity group-hover/comment:opacity-100 focus-within:opacity-100 max-sm:opacity-100">
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/pullRequest/guide/GuideStop.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ export function GuideStop({
>
<MessageCircleQuestionIcon
aria-hidden
className="mt-0.5 size-3.5 shrink-0 text-muted-foreground"
className="size-3.5 h-lh shrink-0 text-muted-foreground"
/>
<span className="sr-only">Ask an agent: </span>
<span>
Expand Down
14 changes: 7 additions & 7 deletions apps/web/src/components/settings/DiagnosticsSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -987,13 +987,13 @@ export function DiagnosticsSettingsPanel() {
<div className="space-y-2 border-t border-border/60 px-4 py-3 text-xs text-muted-foreground sm:px-5">
{processDiagnosticsError ? (
<div className="flex items-start gap-2 text-destructive">
<AlertTriangleIcon className="mt-0.5 size-3.5 shrink-0" />
<AlertTriangleIcon className="size-3.5 h-lh shrink-0" />
<span>{processDiagnosticsError.message}</span>
</div>
) : null}
{processError ? (
<div className="flex items-start gap-2 text-destructive">
<AlertTriangleIcon className="mt-0.5 size-3.5 shrink-0" />
<AlertTriangleIcon className="size-3.5 h-lh shrink-0" />
<span>{processError}</span>
</div>
) : null}
Expand Down Expand Up @@ -1053,13 +1053,13 @@ export function DiagnosticsSettingsPanel() {
<div className="space-y-2 border-t border-border/60 px-4 py-3 text-xs text-muted-foreground sm:px-5">
{processResourceError ? (
<div className="flex items-start gap-2 text-destructive">
<AlertTriangleIcon className="mt-0.5 size-3.5 shrink-0" />
<AlertTriangleIcon className="size-3.5 h-lh shrink-0" />
<span>{processResourceError.message}</span>
</div>
) : null}
{resourceError ? (
<div className="flex items-start gap-2 text-destructive">
<AlertTriangleIcon className="mt-0.5 size-3.5 shrink-0" />
<AlertTriangleIcon className="size-3.5 h-lh shrink-0" />
<span>{resourceError}</span>
</div>
) : null}
Expand Down Expand Up @@ -1136,7 +1136,7 @@ export function DiagnosticsSettingsPanel() {
<div className="space-y-2 border-t border-border/60 px-4 py-3 text-xs text-muted-foreground sm:px-5">
{openLogsDirectoryError ? (
<div className="flex items-start gap-2 text-destructive">
<AlertTriangleIcon className="mt-0.5 size-3.5 shrink-0" />
<AlertTriangleIcon className="size-3.5 h-lh shrink-0" />
<span>{openLogsDirectoryError}</span>
</div>
) : null}
Expand All @@ -1147,7 +1147,7 @@ export function DiagnosticsSettingsPanel() {
traceDiagnosticsPartialFailure ? "text-warning-foreground" : "text-destructive",
)}
>
<AlertTriangleIcon className="mt-0.5 size-3.5 shrink-0" />
<AlertTriangleIcon className="size-3.5 h-lh shrink-0" />
<span>
{traceDiagnosticsPartialFailure
? `Some trace files could not be read, so diagnostics may be incomplete. ${traceDiagnosticsError.message}`
Expand All @@ -1157,7 +1157,7 @@ export function DiagnosticsSettingsPanel() {
) : null}
{error ? (
<div className="flex items-start gap-2 text-destructive">
<AlertTriangleIcon className="mt-0.5 size-3.5 shrink-0" />
<AlertTriangleIcon className="size-3.5 h-lh shrink-0" />
<span>{error}</span>
</div>
) : null}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1065,7 +1065,7 @@ export function ResourceTelemetryDiagnostics({
</div>
{telemetry.error ? (
<div className="flex items-start gap-2 border-t border-destructive/20 bg-destructive/5 px-4 py-3 text-xs text-destructive sm:px-5">
<AlertTriangleIcon className="mt-0.5 size-3.5 shrink-0" />
<AlertTriangleIcon className="size-3.5 h-lh shrink-0" />
<span>{telemetry.error}</span>
</div>
) : null}
Expand Down Expand Up @@ -1243,7 +1243,7 @@ export function ResourceTelemetryDiagnostics({
<div className="overflow-hidden rounded-2xl border border-border/70 bg-card shadow-xs/5">
{history.error ? (
<div className="flex items-start gap-2 border-b border-destructive/20 bg-destructive/5 px-4 py-3 text-xs text-destructive sm:px-5">
<AlertTriangleIcon className="mt-0.5 size-3.5 shrink-0" />
<AlertTriangleIcon className="size-3.5 h-lh shrink-0" />
<span>{history.error}</span>
</div>
) : null}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/settings/SettingsSidebarNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const SETTINGS_NAV_ITEMS: ReadonlyArray<{

function SettingsSectionIcon({ to }: { to: SettingsPath }) {
const Icon = SETTINGS_SECTION_ICONS[to];
return <Icon className="mt-0.5 size-3.5 shrink-0 text-sidebar-muted-foreground/60" />;
return <Icon className="size-3.5 h-5 shrink-0 text-sidebar-muted-foreground/60" />;
}

export function SettingsSidebarNav({ pathname }: { pathname: string }) {
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/ui/toast.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ function ToastDescriptionAndExpandable({
</div>
<MorphIcon
aria-hidden
className="mt-0.5 size-3.5 shrink-0 text-muted-foreground opacity-80"
className="size-3.5 h-lh shrink-0 text-muted-foreground opacity-80"
icon={open ? ChevronUp : ChevronDown}
strokeWidth={2.25}
/>
Expand Down
Loading