Skip to content
Draft
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
3 changes: 2 additions & 1 deletion extensions/theme-defaults/themes/2026-dark.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
"button.background": "#297AA0",
"button.foreground": "#FFFFFF",
"button.hoverBackground": "#2B7DA3",
"button.border": "#333536FF",
"button.border": "#297AA0",
"button.secondaryHoverBackground": "#FFFFFF10",
"button.secondaryBorder": "#333536",
"checkbox.background": "#242526",
Comment on lines 21 to 27
"checkbox.border": "#333536",
"checkbox.foreground": "#8C8C8C",
Expand Down
3 changes: 2 additions & 1 deletion extensions/theme-defaults/themes/2026-light.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@
"button.background": "#0069CC",
"button.foreground": "#FFFFFF",
"button.hoverBackground": "#0063C1",
"button.border": "#EEEEF1",
"button.border": "#0069CC",
"button.secondaryBackground": "#EAEAEA",
"button.secondaryForeground": "#202020",
"button.secondaryHoverBackground": "#F2F3F4",
"button.secondaryBorder": "#EAEAEA",
Comment on lines 21 to +28
"checkbox.background": "#EAEAEA",
"checkbox.border": "#D8D8D8",
"checkbox.foreground": "#606060",
Expand Down
10 changes: 10 additions & 0 deletions src/vs/base/browser/ui/button/button.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
overflow-wrap: normal;
}

.monaco-text-button.secondary {
border-color: var(--vscode-button-secondaryBorder, var(--vscode-button-border, transparent));
}

.monaco-text-button.small {
line-height: 14px;
font-size: 11px;
Expand Down Expand Up @@ -115,6 +119,10 @@
align-items: center;
}

.monaco-button-dropdown > .monaco-button.monaco-dropdown-button.secondary {
border-color: var(--vscode-button-secondaryBorder, var(--vscode-button-border, transparent));
}

.monaco-button-dropdown > .monaco-button.monaco-text-button {
border-radius: 4px 0 0 4px;
}
Expand Down Expand Up @@ -177,6 +185,8 @@

.monaco-button-dropdown.default-colors .monaco-button.secondary + .monaco-button-dropdown-separator {
background-color: var(--vscode-button-secondaryBackground);
border-top-color: var(--vscode-button-secondaryBorder, var(--vscode-button-border));
border-bottom-color: var(--vscode-button-secondaryBorder, var(--vscode-button-border));
}

.monaco-button-dropdown.default-colors .monaco-button-dropdown-separator > div {
Expand Down
4 changes: 2 additions & 2 deletions src/vs/platform/theme/browser/defaultStyles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { IButtonStyles } from '../../../base/browser/ui/button/button.js';
import { IKeybindingLabelStyles } from '../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
import { ColorIdentifier, keybindingLabelBackground, keybindingLabelBorder, keybindingLabelBottomBorder, keybindingLabelForeground, asCssVariable, widgetShadow, buttonForeground, buttonSeparator, buttonBackground, buttonHoverBackground, buttonSecondaryForeground, buttonSecondaryBackground, buttonSecondaryHoverBackground, buttonBorder, progressBarBackground, inputActiveOptionBorder, inputActiveOptionForeground, inputActiveOptionBackground, editorWidgetBackground, editorWidgetForeground, contrastBorder, checkboxBorder, checkboxBackground, checkboxForeground, problemsErrorIconForeground, problemsWarningIconForeground, problemsInfoIconForeground, inputBackground, inputForeground, inputBorder, textLinkForeground, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationInfoForeground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationWarningForeground, inputValidationErrorBorder, inputValidationErrorBackground, inputValidationErrorForeground, listFilterWidgetBackground, listFilterWidgetNoMatchesOutline, listFilterWidgetOutline, listFilterWidgetShadow, badgeBackground, badgeForeground, breadcrumbsBackground, breadcrumbsForeground, breadcrumbsFocusForeground, breadcrumbsActiveSelectionForeground, activeContrastBorder, listActiveSelectionBackground, listActiveSelectionForeground, listActiveSelectionIconForeground, listDropOverBackground, listFocusAndSelectionOutline, listFocusBackground, listFocusForeground, listFocusOutline, listHoverBackground, listHoverForeground, listInactiveFocusBackground, listInactiveFocusOutline, listInactiveSelectionBackground, listInactiveSelectionForeground, listInactiveSelectionIconForeground, tableColumnsBorder, tableOddRowsBackgroundColor, treeIndentGuidesStroke, asCssVariableWithDefault, editorWidgetBorder, focusBorder, pickerGroupForeground, quickInputListFocusBackground, quickInputListFocusForeground, quickInputListFocusIconForeground, selectBackground, selectBorder, selectForeground, selectListBackground, treeInactiveIndentGuidesStroke, menuBorder, menuForeground, menuBackground, menuSelectionBorder, menuSeparatorBackground, scrollbarShadow, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, listDropBetweenBackground, radioActiveBackground, radioActiveForeground, radioInactiveBackground, radioInactiveForeground, radioInactiveBorder, radioInactiveHoverBackground, radioActiveBorder, checkboxDisabledBackground, checkboxDisabledForeground, widgetBorder } from '../common/colorRegistry.js';
import { ColorIdentifier, keybindingLabelBackground, keybindingLabelBorder, keybindingLabelBottomBorder, keybindingLabelForeground, asCssVariable, widgetShadow, buttonForeground, buttonSeparator, buttonBackground, buttonHoverBackground, buttonSecondaryForeground, buttonSecondaryBackground, buttonSecondaryHoverBackground, buttonBorder, progressBarBackground, inputActiveOptionBorder, inputActiveOptionForeground, inputActiveOptionBackground, editorWidgetBackground, editorWidgetForeground, contrastBorder, checkboxBorder, checkboxBackground, checkboxForeground, problemsErrorIconForeground, problemsWarningIconForeground, problemsInfoIconForeground, inputBackground, inputForeground, inputBorder, textLinkForeground, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationInfoForeground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationWarningForeground, inputValidationErrorBorder, inputValidationErrorBackground, inputValidationErrorForeground, listFilterWidgetBackground, listFilterWidgetNoMatchesOutline, listFilterWidgetOutline, listFilterWidgetShadow, badgeBackground, badgeForeground, breadcrumbsBackground, breadcrumbsForeground, breadcrumbsFocusForeground, breadcrumbsActiveSelectionForeground, activeContrastBorder, listActiveSelectionBackground, listActiveSelectionForeground, listActiveSelectionIconForeground, listDropOverBackground, listFocusAndSelectionOutline, listFocusBackground, listFocusForeground, listFocusOutline, listHoverBackground, listHoverForeground, listInactiveFocusBackground, listInactiveFocusOutline, listInactiveSelectionBackground, listInactiveSelectionForeground, listInactiveSelectionIconForeground, tableColumnsBorder, tableOddRowsBackgroundColor, treeIndentGuidesStroke, asCssVariableWithDefault, editorWidgetBorder, focusBorder, pickerGroupForeground, quickInputListFocusBackground, quickInputListFocusForeground, quickInputListFocusIconForeground, selectBackground, selectBorder, selectForeground, selectListBackground, treeInactiveIndentGuidesStroke, menuBorder, menuForeground, menuBackground, menuSelectionBorder, menuSeparatorBackground, scrollbarShadow, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, listDropBetweenBackground, radioActiveBackground, radioActiveForeground, radioInactiveBackground, radioInactiveForeground, radioInactiveBorder, radioInactiveHoverBackground, radioActiveBorder, checkboxDisabledBackground, checkboxDisabledForeground, widgetBorder, buttonSecondaryBorder } from '../common/colorRegistry.js';
import { IProgressBarStyles } from '../../../base/browser/ui/progressbar/progressbar.js';
import { ICheckboxStyles, IToggleStyles } from '../../../base/browser/ui/toggle/toggle.js';
import { IDialogStyles } from '../../../base/browser/ui/dialog/dialog.js';
Expand Down Expand Up @@ -51,7 +51,7 @@ export const defaultButtonStyles: IButtonStyles = {
buttonSecondaryForeground: asCssVariable(buttonSecondaryForeground),
buttonSecondaryBackground: asCssVariable(buttonSecondaryBackground),
buttonSecondaryHoverBackground: asCssVariable(buttonSecondaryHoverBackground),
buttonSecondaryBorder: asCssVariable(buttonBorder),
buttonSecondaryBorder: asCssVariable(buttonSecondaryBorder),
buttonBorder: asCssVariable(buttonBorder),
};

Expand Down
2 changes: 1 addition & 1 deletion src/vs/platform/theme/common/colors/inputColors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export const buttonSecondaryBackground = registerColor('button.secondaryBackgrou
nls.localize('buttonSecondaryBackground', "Secondary button background color."));

export const buttonSecondaryBorder = registerColor('button.secondaryBorder',
contrastBorder,
{ dark: transparent(foreground, 0.15), light: transparent(foreground, 0.15), hcDark: contrastBorder, hcLight: contrastBorder },
nls.localize('buttonSecondaryBorder', "Secondary button border color."));

export const buttonSecondaryHoverBackground = registerColor('button.secondaryHoverBackground',
Expand Down
4 changes: 2 additions & 2 deletions src/vs/sessions/common/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { registerColor, transparent } from '../../platform/theme/common/colorUti
import { contrastBorder, focusBorder } from '../../platform/theme/common/colorRegistry.js';
import { editorWidgetBorder, editorBackground, toolbarHoverBackground } from '../../platform/theme/common/colors/editorColors.js';
import { foreground } from '../../platform/theme/common/colors/baseColors.js';
import { buttonBackground, buttonBorder, inputBackground, inputBorder, inputForeground, inputPlaceholderForeground } from '../../platform/theme/common/colors/inputColors.js';
import { buttonBackground, buttonSecondaryBorder, inputBackground, inputBorder, inputForeground, inputPlaceholderForeground } from '../../platform/theme/common/colors/inputColors.js';
import { ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND } from '../../workbench/common/theme.js';

// ============================================================================
Expand Down Expand Up @@ -126,7 +126,7 @@ export const agentsNewSessionButtonForeground = registerColor(
);

export const agentsNewSessionButtonBorder = registerColor(
'agentsNewSessionButton.border', buttonBorder,
'agentsNewSessionButton.border', buttonSecondaryBorder,
localize('agentsNewSessionButton.border', 'Border color of the New Session button in the agent sessions sidebar.')
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@
.changes-view-body .chat-editing-session-actions .monaco-button.secondary.monaco-text-button {
background-color: var(--vscode-button-secondaryBackground);
color: var(--vscode-button-secondaryForeground);
border-color: var(--vscode-button-secondaryBorder);
}

Comment on lines 229 to 234
.changes-view-body .chat-editing-session-actions.outside-card .monaco-button-dropdown > .monaco-button.secondary.monaco-text-button {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { CommandsRegistry, ICommandService } from '../../../../platform/commands
import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
import { registerThemingParticipant, IColorTheme, ICssStyleCollector } from '../../../../platform/theme/common/themeService.js';
import { ThemeIcon } from '../../../../base/common/themables.js';
import { buttonBackground, buttonForeground, buttonHoverBackground, buttonSecondaryBackground, buttonSecondaryForeground, buttonSecondaryHoverBackground, registerColor, editorWarningForeground, editorInfoForeground, editorErrorForeground, buttonSeparator, buttonBorder, contrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
import { buttonBackground, buttonForeground, buttonHoverBackground, buttonSecondaryBackground, buttonSecondaryForeground, buttonSecondaryHoverBackground, registerColor, editorWarningForeground, editorInfoForeground, editorErrorForeground, buttonSeparator, contrastBorder, buttonSecondaryBorder } from '../../../../platform/theme/common/colorRegistry.js';
import { IJSONEditingService } from '../../../services/configuration/common/jsonEditing.js';
import { ITextEditorSelection } from '../../../../platform/editor/common/editor.js';
import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
Expand Down Expand Up @@ -3409,8 +3409,8 @@ registerColor('extensionButton.hoverBackground', {
}, localize('extensionButtonHoverBackground', "Button background hover color for extension actions."));

registerColor('extensionButton.border', {
dark: buttonBorder,
light: buttonBorder,
dark: buttonSecondaryBorder,
light: buttonSecondaryBorder,
hcDark: contrastBorder,
hcLight: contrastBorder
}, localize('extensionButtonBorder', "Button border color for extension actions."));
Expand Down
Loading