From ed713d2423bcea2ed5380ef9b99db29b0e02dbac Mon Sep 17 00:00:00 2001
From: Sergei Shmakov <sergei.shmakov@gitkraken.com>
Date: Fri, 30 May 2025 18:40:06 +0200
Subject: [PATCH 1/3] Moves the issue card above the branch card

(#4332, #4349)
---
 src/webviews/apps/plus/home/components/active-work.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/webviews/apps/plus/home/components/active-work.ts b/src/webviews/apps/plus/home/components/active-work.ts
index 064f49d8cac87..2bb9d7b21e036 100644
--- a/src/webviews/apps/plus/home/components/active-work.ts
+++ b/src/webviews/apps/plus/home/components/active-work.ts
@@ -243,9 +243,9 @@ export class GlActiveBranchCard extends GlBranchCardBase {
 
 	override render(): unknown {
 		return html`
-			${this.renderBranchIndicator()}${this.renderBranchItem(
+			${this.renderBranchIndicator()}${this.renderIssuesItem()}${this.renderBranchItem(
 				html`${this.renderBranchStateActions()}${this.renderBranchActions()}`,
-			)}${this.renderPrItem()}${this.renderIssuesItem()}
+			)}${this.renderPrItem()}
 		`;
 	}
 

From cb2f4f126215beda7e1efde5d46ee897b849fa7f Mon Sep 17 00:00:00 2001
From: Sergei Shmakov <sergei.shmakov@gitkraken.com>
Date: Fri, 30 May 2025 19:28:09 +0200
Subject: [PATCH 2/3] Modifies issue row when no issue is associated with the
 active branch

(#4332, #4349)
---
 .../apps/plus/home/components/active-work.ts  | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/webviews/apps/plus/home/components/active-work.ts b/src/webviews/apps/plus/home/components/active-work.ts
index 2bb9d7b21e036..f8f6b492ee15a 100644
--- a/src/webviews/apps/plus/home/components/active-work.ts
+++ b/src/webviews/apps/plus/home/components/active-work.ts
@@ -232,6 +232,11 @@ export class GlActiveBranchCard extends GlBranchCardBase {
 				flex-direction: column;
 				gap: 0.8rem;
 			}
+
+			span.branch-item__missing {
+				color: var(--vscode-descriptionForeground);
+				font-style: italic;
+			}
 		`,
 	];
 
@@ -518,16 +523,21 @@ export class GlActiveBranchCard extends GlBranchCardBase {
 		if (!issues.length) {
 			if (!this.expanded) return nothing;
 
-			return html`<gl-button
-				class="branch-item__missing"
-				appearance="secondary"
-				full
-				href=${this.createCommandLink<AssociateIssueWithBranchCommandArgs>('gitlens.associateIssueWithBranch', {
-					branch: this.branch.reference,
-					source: 'home',
-				})}
-				>Associate an Issue</gl-button
-			>`;
+			return html`<div class="branch-item__row" full>
+				<span class="branch-item__missing" full>Current work item</span>
+				<gl-tooltip hoist content="Associate an issue">
+					<a
+						href=${this.createCommandLink<AssociateIssueWithBranchCommandArgs>(
+							'gitlens.associateIssueWithBranch',
+							{
+								branch: this.branch.reference,
+								source: 'home',
+							},
+						)}
+						><span class="branch-item__icon"> <issue-icon></issue-icon> </span
+					></a>
+				</gl-tooltip>
+			</div>`;
 		}
 		return super.renderIssuesItem();
 	}

From adf34761bb0f138e2eecc9b4911a14a7f7fb5abf Mon Sep 17 00:00:00 2001
From: Sergei Shmakov <sergei.shmakov@gitkraken.com>
Date: Fri, 30 May 2025 19:36:30 +0200
Subject: [PATCH 3/3] Modifies the current issue card to be shorter than the
 other cards

reduces the top/bottom padding to 4px from 8px
(#4332, #4349)
---
 src/webviews/apps/plus/home/components/active-work.ts | 4 ++++
 src/webviews/apps/plus/home/components/branch-card.ts | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/webviews/apps/plus/home/components/active-work.ts b/src/webviews/apps/plus/home/components/active-work.ts
index f8f6b492ee15a..ce3f6a92db47b 100644
--- a/src/webviews/apps/plus/home/components/active-work.ts
+++ b/src/webviews/apps/plus/home/components/active-work.ts
@@ -237,6 +237,10 @@ export class GlActiveBranchCard extends GlBranchCardBase {
 				color: var(--vscode-descriptionForeground);
 				font-style: italic;
 			}
+
+			gl-work-item {
+				--gl-card-vertical-padding: 0.4rem;
+			}
 		`,
 	];
 
diff --git a/src/webviews/apps/plus/home/components/branch-card.ts b/src/webviews/apps/plus/home/components/branch-card.ts
index 441d2479478e4..241d53daa53a5 100644
--- a/src/webviews/apps/plus/home/components/branch-card.ts
+++ b/src/webviews/apps/plus/home/components/branch-card.ts
@@ -1152,6 +1152,8 @@ export class GlWorkUnit extends LitElement {
 
 			gl-card::part(base) {
 				margin-block-end: 0;
+				padding-top: var(--gl-card-vertical-padding, 0.8rem);
+				padding-bottom: var(--gl-card-vertical-padding, 0.8rem);
 			}
 		`,
 	];