Skip to content

Commit a8b0db5

Browse files
d13claude
andcommitted
Fixes design of the paused-operation actions - fixes #5394
Replaces the GitLens `continue` icon's SVG (images/icons/continue.svg) with the codicons debug-start glyph and regenerates glicons.woff2, so the Continue action renders a start/play icon while staying within the GitLens icon font — consistent with the adjacent Skip/Abort actions — across the webview banner, the sidebar view nodes, and the rebase editor's paused indicator. Bumps the @font-face cache-busting hash in the webview HTML so the new glyph loads. Also makes the banner action buttons' hover/active states blend into the banner: action-item exposes --action-item-hover-background/-active-background (defaulting to the existing toolbar tokens) and the banner overrides them with a color-mix tint of currentColor, which tracks the banner foreground and adapts to the conflicts variant automatically. Co-Authored-By: Claude <noreply@anthropic.com>
1 parent c23c652 commit a8b0db5

14 files changed

Lines changed: 19 additions & 13 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
3232
- Fixes _Fetch_, _Pull_, _Switch_, _Reset_, and _Restore_ operations silently reporting success when the underlying Git command failed with a message Git treats as a warning (e.g. an unreachable remote, or an invalid ref/revision) &mdash; these failures are now surfaced as errors instead of being swallowed as non-fatal
3333
- Fixes the working changes (WIP) stats tooltip in the details header duplicating the visible stats pill instead of describing the change breakdown &mdash; the tooltip now reads e.g. _1 file added, 2 files changed in the working tree_
3434
- Fixes a stray gap in the _Commit Graph_ header next to the fetch and sync actions when the current branch is already published &mdash; the publish action no longer reserves empty space once the branch has an upstream
35+
- Fixes the design of the paused-operation banner (shown during a merge, rebase, cherry-pick, or revert in the _Commit Graph_/_Inspect_ details and _Home_) &mdash; the _Continue_ action now uses a start icon, and the action buttons' hover and active states blend into the banner instead of showing a clashing grey toolbar highlight ([#5394](https://github.com/gitkraken/vscode-gitlens/issues/5394))
3536

3637
## [18.2.0] - 2026-06-15
3738

images/icons/continue.svg

Lines changed: 1 addition & 1 deletion
Loading

src/webviews/apps/commitDetails/commitDetails.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@font-face {
1212
font-family: 'glicons';
1313
font-display: block;
14-
src: url('#{root}/dist/glicons.woff2?6d6df3d609ab75f20b22aecdd3ed6c98') format('woff2');
14+
src: url('#{root}/dist/glicons.woff2?fb0b58b073e5be99ebcc26777a647643') format('woff2');
1515
}
1616
@font-face {
1717
font-family: 'seti';

src/webviews/apps/home/home.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@font-face {
1212
font-family: 'glicons';
1313
font-display: block;
14-
src: url('#{root}/dist/glicons.woff2?6d6df3d609ab75f20b22aecdd3ed6c98') format('woff2');
14+
src: url('#{root}/dist/glicons.woff2?fb0b58b073e5be99ebcc26777a647643') format('woff2');
1515
}
1616
</style>
1717
</head>

src/webviews/apps/plus/composer/composer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@font-face {
1212
font-family: 'glicons';
1313
font-display: block;
14-
src: url('#{root}/dist/glicons.woff2?6d6df3d609ab75f20b22aecdd3ed6c98') format('woff2');
14+
src: url('#{root}/dist/glicons.woff2?fb0b58b073e5be99ebcc26777a647643') format('woff2');
1515
}
1616
</style>
1717
<script type="application/javascript" nonce="#{cspNonce}">

src/webviews/apps/plus/graph/graph.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@font-face {
1212
font-family: 'glicons';
1313
font-display: block;
14-
src: url('#{root}/dist/glicons.woff2?6d6df3d609ab75f20b22aecdd3ed6c98') format('woff2');
14+
src: url('#{root}/dist/glicons.woff2?fb0b58b073e5be99ebcc26777a647643') format('woff2');
1515
}
1616
@font-face {
1717
font-family: 'seti';

src/webviews/apps/plus/patchDetails/patchDetails.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@font-face {
1212
font-family: 'glicons';
1313
font-display: block;
14-
src: url('#{root}/dist/glicons.woff2?6d6df3d609ab75f20b22aecdd3ed6c98') format('woff2');
14+
src: url('#{root}/dist/glicons.woff2?fb0b58b073e5be99ebcc26777a647643') format('woff2');
1515
}
1616
</style>
1717
</head>

src/webviews/apps/plus/shared/components/merge-rebase-status.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ export class GlMergeConflictWarning extends LitElement {
2121
css`
2222
.status {
2323
--action-item-foreground: #000;
24+
/* Blend the action hover/active states into the banner instead of the generic
25+
grey toolbar hover. currentColor tracks --action-item-foreground, so the
26+
conflicts variant (white foreground) tints correctly without redeclaring. */
27+
--action-item-hover-background: color-mix(in srgb, currentColor 12%, transparent);
28+
--action-item-active-background: color-mix(in srgb, currentColor 22%, transparent);
2429
2530
box-sizing: border-box;
2631
display: flex;

src/webviews/apps/plus/timeline/timeline.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@font-face {
1212
font-family: 'glicons';
1313
font-display: block;
14-
src: url('#{root}/dist/glicons.woff2?6d6df3d609ab75f20b22aecdd3ed6c98') format('woff2');
14+
src: url('#{root}/dist/glicons.woff2?fb0b58b073e5be99ebcc26777a647643') format('woff2');
1515
}
1616
@font-face {
1717
font-family: 'seti';

src/webviews/apps/rebase/rebase.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@font-face {
1212
font-family: 'glicons';
1313
font-display: block;
14-
src: url('#{root}/dist/glicons.woff2?6d6df3d609ab75f20b22aecdd3ed6c98') format('woff2');
14+
src: url('#{root}/dist/glicons.woff2?fb0b58b073e5be99ebcc26777a647643') format('woff2');
1515
}
1616
</style>
1717
<script type="application/javascript" nonce="#{cspNonce}">

0 commit comments

Comments
 (0)