Skip to content

Commit 038ee46

Browse files
committed
Merge remote-tracking branch 'github/main' into issue-watch/28816
2 parents 5dade39 + 3368dd7 commit 038ee46

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎apps/web/src/components/chat/ThreadNow.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ function ThreadNowLine({
3636
return (
3737
<div
3838
role={announce ? "alert" : undefined}
39-
className={lineClassName}
39+
className={cn(lineClassName, "items-baseline")}
4040
data-thread-now-line="true"
4141
>
42-
<span aria-hidden className="flex size-3.5 shrink-0 items-center justify-center">
42+
<span aria-hidden className="flex size-3.5 shrink-0 self-center items-center justify-center">
4343
{item.icon}
4444
</span>
4545
{/* Title and detail read as one line that gives way before the actions, so Stop stays
@@ -61,7 +61,7 @@ function ThreadNowLine({
6161
) : null}
6262
</NoticeText>
6363
{item.actions ? (
64-
<span className="ms-1.5 flex shrink-0 items-center gap-2.5">{item.actions}</span>
64+
<span className="ms-1.5 flex shrink-0 items-baseline gap-2.5">{item.actions}</span>
6565
) : null}
6666
</div>
6767
);

‎apps/web/src/components/usage/UsagePage.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -920,11 +920,11 @@ function UsageOverview({
920920
<table className="w-full text-sm">
921921
<thead>
922922
<tr className="border-b border-border text-right text-xs text-muted-foreground">
923-
<th className="py-2 pr-3 text-left font-normal">#</th>
923+
<th className="py-2 pr-3 pl-2 text-left font-normal">#</th>
924924
<th className="w-full py-2 text-left font-normal">Model</th>
925925
<th className="py-2 pl-6 font-normal">Cost</th>
926926
<th className="hidden py-2 pl-6 font-normal sm:table-cell">Share</th>
927-
<th className="py-2 pl-6 font-normal">Tokens</th>
927+
<th className="py-2 pr-2 pl-6 font-normal">Tokens</th>
928928
</tr>
929929
</thead>
930930
<tbody>
@@ -946,7 +946,7 @@ function UsageOverview({
946946
key={key}
947947
className="relative border-b border-border/50 text-right whitespace-nowrap text-muted-foreground tabular-nums transition-colors hover:bg-muted/50 has-focus-visible:bg-muted/50"
948948
>
949-
<td className="py-2.5 pr-3 text-left text-xs">{index + 1}</td>
949+
<td className="py-2.5 pr-3 pl-2 text-left text-xs">{index + 1}</td>
950950
<td className="py-2.5 text-left whitespace-normal">
951951
<button
952952
type="button"
@@ -981,7 +981,7 @@ function UsageOverview({
981981
<td className={cn("hidden py-2.5 pl-6 sm:table-cell", rowFigures)}>
982982
{share === null ? "" : formatPercent(share)}
983983
</td>
984-
<td className={cn("py-2.5 pl-6", rowFigures)}>
984+
<td className={cn("py-2.5 pr-2 pl-6", rowFigures)}>
985985
{formatTokens(model.totalTokens)}
986986
</td>
987987
</tr>
@@ -1003,14 +1003,14 @@ function UsageOverview({
10031003
</colgroup>
10041004
<thead>
10051005
<tr className="border-b border-border text-left text-xs text-muted-foreground">
1006-
<th className="py-2 font-normal">{shownHourly ? "Hour" : "Day"}</th>
1006+
<th className="py-2 pl-2 font-normal">{shownHourly ? "Hour" : "Day"}</th>
10071007
{activeProviders.map((provider) => (
10081008
<th key={provider} className="py-2 pl-4 text-right font-normal">
10091009
{PROVIDER_PRESENTATION[provider].label}
10101010
</th>
10111011
))}
10121012
<th className="py-2 pl-4 text-right font-normal">Total</th>
1013-
<th className="py-2 pl-4 text-right font-normal">Tokens</th>
1013+
<th className="py-2 pr-2 pl-4 text-right font-normal">Tokens</th>
10141014
</tr>
10151015
</thead>
10161016
<tbody>
@@ -1029,7 +1029,7 @@ function UsageOverview({
10291029
key={"hourStart" in period ? period.hourStart : period.day}
10301030
className="border-b border-border/50 transition-colors hover:bg-muted/50"
10311031
>
1032-
<td className="py-2 text-foreground">
1032+
<td className="py-2 pl-2 text-foreground">
10331033
{"hourStart" in period
10341034
? formatHourShort(period.hourStart, shownWindow.timeZone, hour12)
10351035
: formatDayShort(period.day)}
@@ -1055,7 +1055,7 @@ function UsageOverview({
10551055
</td>
10561056
<td
10571057
className={cn(
1058-
"py-2 pl-4 text-right text-muted-foreground tabular-nums",
1058+
"py-2 pr-2 pl-4 text-right text-muted-foreground tabular-nums",
10591059
figureClass(loadingPartial),
10601060
)}
10611061
>

0 commit comments

Comments
 (0)