diff --git a/extensions/theme-defaults/themes/dark_modern.json b/extensions/theme-defaults/themes/dark_modern.json index 384310738fc..27738936b27 100644 --- a/extensions/theme-defaults/themes/dark_modern.json +++ b/extensions/theme-defaults/themes/dark_modern.json @@ -19,8 +19,8 @@ "button.secondaryBackground": "#313131", "button.secondaryForeground": "#CCCCCC", "button.secondaryHoverBackground": "#3C3C3C", - "chat.slashCommandBackground": "#34414B", - "chat.slashCommandForeground": "#40A6FF", + "chat.slashCommandBackground": "#26477866", + "chat.slashCommandForeground": "#85B6FF", "chat.editedFileForeground": "#E2C08D", "checkbox.background": "#313131", "checkbox.border": "#3C3C3C", diff --git a/extensions/theme-defaults/themes/light_modern.json b/extensions/theme-defaults/themes/light_modern.json index 7f5e622639c..2251c4bac30 100644 --- a/extensions/theme-defaults/themes/light_modern.json +++ b/extensions/theme-defaults/themes/light_modern.json @@ -19,8 +19,8 @@ "button.secondaryBackground": "#E5E5E5", "button.secondaryForeground": "#3B3B3B", "button.secondaryHoverBackground": "#CCCCCC", - "chat.slashCommandBackground": "#D2ECFF", - "chat.slashCommandForeground": "#306CA2", + "chat.slashCommandBackground": "#ADCEFF7A", + "chat.slashCommandForeground": "#26569E", "chat.editedFileForeground": "#895503", "checkbox.background": "#F8F8F8", "checkbox.border": "#CECECE", diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts index 351434fdd2f..168c8c56963 100644 --- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts +++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts @@ -102,6 +102,7 @@ interface IChatListItemTemplate { readonly templateDisposables: IDisposable; readonly elementDisposables: DisposableStore; readonly agentHover: ChatAgentHover; + readonly requestHover?: HTMLElement; } interface IItemHeightChangeParams { @@ -286,7 +287,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer { + if (isRequestVM(template.currentElement)) { + requestHover.style.display = 'block'; + } + })); + + templateDisposables.add(dom.addDisposableListener(rowContainer, 'mouseleave', () => { + if (isRequestVM(template.currentElement)) { + requestHover.style.display = 'none'; + } + })); + const user = dom.append(header, $('.user')); const avatarContainer = dom.append(user, $('.avatar-container')); const username = dom.append(user, $('h3.username')); @@ -332,8 +344,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer .interactive-session) { .interactive-item-container.interactive-request { align-items: flex-end; padding-bottom: 0px; + padding-top: 5px; } .interactive-item-container.interactive-request .value .rendered-markdown { @@ -1900,7 +1900,7 @@ have to be updated for changes to the rules above, or to support more deeply nes width: fit-content; } - .interactive-session .interactive-item-container.interactive-request .chat-attached-context { + .interactive-item-container.interactive-request .chat-attached-context { margin-top: 10px; max-width: 100%; width: fit-content; @@ -1914,8 +1914,31 @@ have to be updated for changes to the rules above, or to support more deeply nes box-shadow: none; } - .interactive-session .interactive-request .header.hidden { + .interactive-request .header.header-disabled { + display: none !important; + } + + .request-hover { + position: absolute; + overflow: hidden; display: none; + z-index: 100; + background-color: var(--vscode-toolbar-hoverBackground); + top: 0px; + right: 10px; + border-radius: 6px; + } + + .request-hover .actions-container { + width: 18px; + height: 17px; + } + + .request-hover .actions-container .action-label.codicon-x { + width: 14px; + height: 14px; + padding-top: 4px; + padding-left: 1px; } } @@ -1939,3 +1962,4 @@ have to be updated for changes to the rules above, or to support more deeply nes width: initial; padding: 4px 8px; } + diff --git a/src/vs/workbench/contrib/chat/common/chatColors.ts b/src/vs/workbench/contrib/chat/common/chatColors.ts index 453c6192b61..b4159ed6c77 100644 --- a/src/vs/workbench/contrib/chat/common/chatColors.ts +++ b/src/vs/workbench/contrib/chat/common/chatColors.ts @@ -21,13 +21,13 @@ export const chatRequestBackground = registerColor( export const chatSlashCommandBackground = registerColor( 'chat.slashCommandBackground', - { dark: '#34414b8f', light: '#d2ecff99', hcDark: Color.white, hcLight: badgeBackground }, + { dark: '#26477866', light: '#adceff7a', hcDark: Color.white, hcLight: badgeBackground }, localize('chat.slashCommandBackground', 'The background color of a chat slash command.') ); export const chatSlashCommandForeground = registerColor( 'chat.slashCommandForeground', - { dark: '#40A6FF', light: '#306CA2', hcDark: Color.black, hcLight: badgeForeground }, + { dark: '#85b6ff', light: '#26569e', hcDark: Color.black, hcLight: badgeForeground }, localize('chat.slashCommandForeground', 'The foreground color of a chat slash command.') );