From 005c0ecc48192e0ae00a8f9111e7fd8f25159be3 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Fri, 11 Aug 2017 10:21:28 +0200 Subject: [PATCH] fixes #31649 --- .../contrib/colorPicker/browser/colorPicker.ts | 17 ----------------- .../colorPicker/browser/colorPickerWidget.ts | 2 +- src/vs/editor/editor.all.ts | 2 +- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 src/vs/editor/contrib/colorPicker/browser/colorPicker.ts diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPicker.ts b/src/vs/editor/contrib/colorPicker/browser/colorPicker.ts deleted file mode 100644 index 908e4b78046..00000000000 --- a/src/vs/editor/contrib/colorPicker/browser/colorPicker.ts +++ /dev/null @@ -1,17 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import './colorDetector'; -import { registerThemingParticipant } from 'vs/platform/theme/common/themeService'; -import { editorWidgetBackground, editorWidgetBorder } from 'vs/platform/theme/common/colorRegistry'; - -registerThemingParticipant((theme, collector) => { - const widgetBackground = theme.getColor(editorWidgetBackground); - collector.addRule(`.monaco-editor .colorpicker-widget { background-color: ${widgetBackground}; }`); - - const widgetBorder = theme.getColor(editorWidgetBorder); - collector.addRule(`.monaco-editor .colorpicker-widget { border: 1px solid ${widgetBorder}; }`); - collector.addRule(`.monaco-editor .colorpicker-header { border-bottom: 1px solid ${widgetBorder}; }`); -}); \ No newline at end of file diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.ts b/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.ts index 6542d8674d7..c1659140cb2 100644 --- a/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.ts +++ b/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.ts @@ -302,7 +302,7 @@ export class ColorPickerWidget extends Widget { this._register(onDidChangeZoomLevel(() => this.layout())); - const element = $('.editor-widget.colorpicker-widget'); + const element = $('.colorpicker-widget'); container.appendChild(element); const header = new ColorPickerHeader(element, this.model); diff --git a/src/vs/editor/editor.all.ts b/src/vs/editor/editor.all.ts index 23b09fc2453..bba9229491d 100644 --- a/src/vs/editor/editor.all.ts +++ b/src/vs/editor/editor.all.ts @@ -41,4 +41,4 @@ import 'vs/editor/contrib/suggest/browser/suggestController'; import 'vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode'; import 'vs/editor/contrib/wordHighlighter/common/wordHighlighter'; import 'vs/editor/contrib/wordOperations/common/wordOperations'; -import 'vs/editor/contrib/colorPicker/browser/colorPicker'; \ No newline at end of file +import 'vs/editor/contrib/colorPicker/browser/colorDetector'; \ No newline at end of file