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 @@ -26,6 +26,7 @@ import { IEditorDecorationsCollection, ScrollType } from '../../../../editor/com
import { OverviewRulerLane } from '../../../../editor/common/model.js';
import * as nls from '../../../../nls.js';
import { IMarkdownRendererService } from '../../../../platform/markdown/browser/markdownRenderer.js';
import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
import { ICodeReviewService } from '../../codeReview/browser/codeReviewService.js';
import { createAgentFeedbackContext } from './agentFeedbackEditorUtils.js';
Expand Down Expand Up @@ -528,10 +529,7 @@ export class AgentFeedbackEditorWidget extends Disposable implements IOverlayWid

const acceptButton = buttonStore.add(new Button(buttonBar, {
title: acceptTooltip,
buttonBackground: 'var(--vscode-charts-purple)',
buttonHoverBackground: 'color-mix(in srgb, var(--vscode-charts-purple) 85%, var(--vscode-foreground))',
buttonForeground: 'var(--vscode-button-foreground)',
buttonBorder: 'var(--vscode-charts-purple)',
...defaultButtonStyles,
}));
acceptButton.label = nls.localize('acceptFeedbackButton', "Accept");
buttonStore.add(acceptButton.onDidClick(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@

.agent-feedback-widget-item-prReview .agent-feedback-widget-item-type,
.agent-feedback-widget-item-agentFeedback .agent-feedback-widget-item-type {
background: color-mix(in srgb, var(--vscode-charts-purple) 22%, var(--vscode-editorWidget-background));
color: var(--vscode-charts-purple);
background: color-mix(in srgb, var(--vscode-button-background) 22%, var(--vscode-editorWidget-background));
color: var(--vscode-button-background);
}

/* Line info */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,21 @@ suite('AgentFeedbackEditorWidget', () => {
}, resolvedComment);
});

test('created feedback uses the standard primary button colors', () => {
const createdComment: ISessionEditorComment = { ...comment, state: AgentFeedbackState.Created };
withWidget(({ domNode }) => {
const acceptButton = domNode.querySelector<HTMLElement>('.agent-feedback-widget-actions-bar .monaco-button:not(.secondary)')!;

assert.deepStrictEqual({
backgroundColor: acceptButton.style.backgroundColor,
color: acceptButton.style.color,
}, {
backgroundColor: 'var(--vscode-button-background)',
color: 'var(--vscode-button-foreground)',
});
}, createdComment);
});

function prReviewComment(sourcePullRequest: IFeedbackPullRequest): ISessionEditorComment {
return {
...comment,
Expand Down