From 4454c8697758b11daedd4d71d11c2913cb10cd17 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Wed, 22 Mar 2017 17:55:42 +0100 Subject: [PATCH] [theme] linenumbers theming --- .../theme-abyss/themes/abyss-color-theme.json | 1 + .../browser/viewParts/lineNumbers/lineNumbers.css | 4 ---- .../browser/viewParts/lineNumbers/lineNumbers.ts | 13 ++++++++++++- src/vs/editor/common/view/editorColorRegistry.ts | 2 ++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/extensions/theme-abyss/themes/abyss-color-theme.json b/extensions/theme-abyss/themes/abyss-color-theme.json index 69712acbbba..6b21413f8e0 100644 --- a/extensions/theme-abyss/themes/abyss-color-theme.json +++ b/extensions/theme-abyss/themes/abyss-color-theme.json @@ -266,6 +266,7 @@ "editorPeekEditorBackground": "#001F33", "editorPeekTitleBackground": "#060621", "editorPeekBorders": "#7777cc", + "editorLineNumbers": "#0000FF", // Workbench Colors "tabsContainerBackground": "#1c1c2a", diff --git a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.css b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.css index 474a00605c1..891fb90831f 100644 --- a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.css +++ b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.css @@ -36,7 +36,3 @@ .monaco-editor .margin-view-overlays .line-numbers.lh-odd { margin-top: 1px; } - -.monaco-editor.vs .line-numbers { color: #2B91AF; } -.monaco-editor.vs-dark .line-numbers { color: #5A5A5A; } -.monaco-editor.hc-black .line-numbers { color: #FFF; } diff --git a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts index 17c9b91102a..8021473d33c 100644 --- a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts +++ b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts @@ -6,6 +6,8 @@ 'use strict'; import 'vs/css!./lineNumbers'; +import { editorLineNumbers } from "vs/editor/common/view/editorColorRegistry"; +import { registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import * as platform from 'vs/base/common/platform'; import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay'; import { ClassNames } from 'vs/editor/browser/editorBrowser'; @@ -135,4 +137,13 @@ export class LineNumbersOverlay extends DynamicViewOverlay { } return this._renderResult[lineIndex]; } -} \ No newline at end of file +} + +// theming + +registerThemingParticipant((theme, collector) => { + let lineNumbers = theme.getColor(editorLineNumbers); + if (lineNumbers) { + collector.addRule(`.monaco-editor.${theme.selector} .line-numbers { color: ${lineNumbers}; }`); + } +}); \ No newline at end of file diff --git a/src/vs/editor/common/view/editorColorRegistry.ts b/src/vs/editor/common/view/editorColorRegistry.ts index 46b0a81201b..41990757afe 100644 --- a/src/vs/editor/common/view/editorColorRegistry.ts +++ b/src/vs/editor/common/view/editorColorRegistry.ts @@ -17,6 +17,8 @@ export const editorRangeHighlight = registerColor('editorRangeHighlight', { dark export const editorCursor = registerColor('editorCursor', { dark: '#AEAFAD', light: Color.black, hc: Color.white }, nls.localize('caret', 'Editor cursor color')); export const editorInvisibles = registerColor('editorInvisibles', { dark: '#e3e4e229', light: '#33333333', hc: '#e3e4e229' }, nls.localize('invisibles', 'Editor invisibles color')); export const editorGuide = registerColor('editorGuide', { dark: editorInvisibles, light: editorInvisibles, hc: editorInvisibles }, nls.localize('guide', 'Editor guide color')); +export const editorLineNumbers = registerColor('editorLineNumbers', { dark: '#5A5A5A', light: '#2B91AF', hc: Color.white }, nls.localize('editorLineNumbers', 'Editor line numbers')); + // contains all color rules that used to defined in editor/browser/widget/editor.css registerThemingParticipant((theme, collector) => { -- GitLab