mirror of
https://seed.radicle.dev/rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git
synced 2026-11-16 03:40:37 +08:00
Show target branch on merge marker
This commit is contained in:
@@ -48,6 +48,7 @@
|
||||
export let revisionReactions: Comment["reactions"];
|
||||
export let revisionAuthor: Author;
|
||||
export let revisionDescription: string;
|
||||
export let targetBranch: string;
|
||||
export let timelines: Timeline[];
|
||||
export let previousRevBase: string | undefined = undefined;
|
||||
export let previousRevId: string | undefined = undefined;
|
||||
@@ -210,6 +211,11 @@
|
||||
gap: 0.5rem;
|
||||
font: var(--txt-body-m-regular);
|
||||
}
|
||||
.target-branch {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.25rem;
|
||||
}
|
||||
.timestamp {
|
||||
font: var(--txt-body-m-regular);
|
||||
color: var(--color-text-tertiary);
|
||||
@@ -491,6 +497,11 @@
|
||||
|
||||
merged revision
|
||||
<Id id={element.inner.revision} />
|
||||
into
|
||||
<span class="target-branch">
|
||||
<Icon name="branch" />
|
||||
{targetBranch}
|
||||
</span>
|
||||
at commit
|
||||
<Id id={element.inner.commit} />
|
||||
<span
|
||||
|
||||
@@ -548,6 +548,7 @@
|
||||
{timelines}
|
||||
{...revision}
|
||||
first={index === 0}
|
||||
{targetBranch}
|
||||
patchId={patch.id}
|
||||
patchState={patch.state}
|
||||
initiallyExpanded={index === patch.revisions.length - 1}
|
||||
|
||||
Reference in New Issue
Block a user