From 2d0cf23f39ef5dd4b9b4eccda18de7ec95e47acd Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Wed, 28 Jun 2017 15:11:07 -0700 Subject: [PATCH] Have terminal use editor's hover widget styles Fixes #29542 --- .../parts/terminal/electron-browser/media/widgets.css | 9 --------- .../parts/terminal/electron-browser/terminalPanel.ts | 11 ++++++++++- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/widgets.css b/src/vs/workbench/parts/terminal/electron-browser/media/widgets.css index 10751297b59..c7f6999aeae 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/media/widgets.css +++ b/src/vs/workbench/parts/terminal/electron-browser/media/widgets.css @@ -17,13 +17,4 @@ line-height: 19px; padding: 4px 5px; animation: fadein 100ms linear; - background-color: #F3F3F3; - border: 1px solid #CCC; -} -.vs-dark .monaco-workbench .terminal-message-widget { - background-color: #2D2D30; - border-color: #555; -} -.hc-black .monaco-workbench .terminal-message-widget { - background-color: #0C141F; } \ No newline at end of file diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts index ef672fb9806..bec620085a1 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts @@ -17,7 +17,7 @@ import { ITerminalService, ITerminalFont, TERMINAL_PANEL_ID } from 'vs/workbench import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; import { TerminalFindWidget } from './terminalFindWidget'; import { ansiColorIdentifiers, TERMINAL_BACKGROUND_COLOR, TERMINAL_FOREGROUND_COLOR } from './terminalColorRegistry'; -import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry'; +import { ColorIdentifier, editorHoverBackground, editorHoverBorder } from 'vs/platform/theme/common/colorRegistry'; import { KillTerminalAction, CreateNewTerminalAction, SwitchTerminalInstanceAction, SwitchTerminalInstanceActionItem, CopyTerminalSelectionAction, TerminalPasteAction, ClearTerminalAction, SelectAllTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions'; import { Panel } from 'vs/workbench/browser/panel'; import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; @@ -284,6 +284,15 @@ export class TerminalPanel extends Panel { // if (selectionColor) { // css += `.monaco-workbench .panel.integrated-terminal .xterm .xterm-selection div { background-color: ${selectionColor}; }`; // } + // Borrow the editor's hover background for now + let hoverBackground = theme.getColor(editorHoverBackground); + if (hoverBackground) { + css += `.monaco-workbench .panel.integrated-terminal .terminal-message-widget { background-color: ${hoverBackground}; }`; + } + let hoverBorder = theme.getColor(editorHoverBorder); + if (hoverBorder) { + css += `.monaco-workbench .panel.integrated-terminal .terminal-message-widget { border: 1px solid ${hoverBorder}; }`; + } this._themeStyleElement.innerHTML = css; this._findWidget.updateTheme(theme);