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
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@ function ActorMention({
<img
src={actor.avatarUrl}
alt={login}
className="inline-block size-3.5 rounded-full border border-border align-text-bottom"
className="inline-block size-3.5 rounded-full border border-border align-text-bottom self-start"
/>
)}
{login}
Expand All @@ -875,7 +875,7 @@ function getIssueEventDescription(event: TimelineEvent): React.ReactNode {
switch (event.event) {
case "labeled":
return (
<span className="flex items-center gap-1.5">
<span className="flex items-center gap-1.5 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" added "}
{event.label && (
Expand All @@ -889,7 +889,7 @@ function getIssueEventDescription(event: TimelineEvent): React.ReactNode {
);
case "unlabeled":
return (
<span className="flex items-center gap-1.5">
<span className="flex items-center gap-1.5 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" removed "}
{event.label && (
Expand All @@ -903,23 +903,23 @@ function getIssueEventDescription(event: TimelineEvent): React.ReactNode {
);
case "assigned":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" assigned "}
<ActorMention actor={event.assignee} />
</span>
);
case "unassigned":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" unassigned "}
<ActorMention actor={event.assignee} />
</span>
);
case "renamed":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" changed the title from "}
<span className="line-through">{event.rename?.from}</span>
Expand All @@ -931,14 +931,14 @@ function getIssueEventDescription(event: TimelineEvent): React.ReactNode {
);
case "closed":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" closed this"}
</span>
);
case "reopened":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" reopened this"}
</span>
Expand All @@ -948,7 +948,7 @@ function getIssueEventDescription(event: TimelineEvent): React.ReactNode {
if (!event.source) return null;
const prefix = event.source.type === "pull_request" ? "PR" : "Issue";
return (
<span className="inline-flex flex-wrap items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} />
{" mentioned this in "}
<span className="font-medium text-foreground">
Expand All @@ -962,7 +962,7 @@ function getIssueEventDescription(event: TimelineEvent): React.ReactNode {
}
case "milestoned":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" added this to the "}
<span className="font-medium text-foreground">
Expand All @@ -973,7 +973,7 @@ function getIssueEventDescription(event: TimelineEvent): React.ReactNode {
);
case "demilestoned":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" removed this from the "}
<span className="font-medium text-foreground">
Expand All @@ -984,15 +984,15 @@ function getIssueEventDescription(event: TimelineEvent): React.ReactNode {
);
case "review_requested":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" requested review from "}
<ActorMention actor={reviewer} />
</span>
);
case "review_request_removed":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" removed review request for "}
<ActorMention actor={reviewer} />
Expand Down
26 changes: 13 additions & 13 deletions apps/dashboard/src/components/pulls/detail/pull-detail-activity.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2664,7 +2664,7 @@ function ActorMention({
<img
src={actor.avatarUrl}
alt={login}
className="inline-block size-3.5 rounded-full border border-border align-text-bottom"
className="inline-block size-3.5 rounded-full border border-border align-text-bottom self-start"
/>
)}
{login}
Expand All @@ -2683,7 +2683,7 @@ function getEventDescription(
switch (event.event) {
case "labeled":
return (
<span className="flex items-center gap-1.5">
<span className="flex items-center gap-1.5 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" added "}
{event.label && (
Expand All @@ -2697,7 +2697,7 @@ function getEventDescription(
);
case "unlabeled":
return (
<span className="flex items-center gap-1.5">
<span className="flex items-center gap-1.5 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" removed "}
{event.label && (
Expand All @@ -2711,31 +2711,31 @@ function getEventDescription(
);
case "assigned":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" assigned "}
<ActorMention actor={event.assignee} />
</span>
);
case "unassigned":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" unassigned "}
<ActorMention actor={event.assignee} />
</span>
);
case "review_requested":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" requested review from "}
<ActorMention actor={reviewer} />
</span>
);
case "review_request_removed":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" removed review request for "}
<ActorMention actor={reviewer} />
Expand All @@ -2758,7 +2758,7 @@ function getEventDescription(
}
case "renamed":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" changed the title from "}
<span className="line-through">{event.rename?.from}</span>
Expand Down Expand Up @@ -2787,7 +2787,7 @@ function getEventDescription(
if (!event.source) return null;
const prefix = event.source.type === "pull_request" ? "PR" : "Issue";
return (
<span className="inline-flex flex-wrap items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} />
{" mentioned this in "}
<span className="font-medium text-foreground">
Expand All @@ -2801,7 +2801,7 @@ function getEventDescription(
}
case "milestoned":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" added this to the "}
<span className="font-medium text-foreground">
Expand All @@ -2812,7 +2812,7 @@ function getEventDescription(
);
case "demilestoned":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" removed this from the "}
<span className="font-medium text-foreground">
Expand All @@ -2837,7 +2837,7 @@ function getEventDescription(
);
case "head_ref_deleted":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" deleted "}
<code className="rounded bg-surface-1 px-1 py-0.5 font-mono text-[10px] text-muted-foreground">
Expand All @@ -2848,7 +2848,7 @@ function getEventDescription(
);
case "head_ref_restored":
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex items-center gap-1 flex-wrap">
<ActorMention actor={event.actor} hideAvatar />
{" restored "}
<code className="rounded bg-surface-1 px-1 py-0.5 font-mono text-[10px] text-muted-foreground">
Expand Down