Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-24 16:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[theme] rename peek view match color names (for #23464)

Browse Source
This commit is contained in:
Martin Aeschlimann
2017-03-30 11:51:43 +02:00
parent e146a508c8
commit 6bac4340f3
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/theme-abyss/themes/abyss-color-theme.json
+1 -1
View File
@@ -272,7 +272,7 @@
"editorPeekEditorBackground": "#001F33",
"editorPeekTitleBackground": "#060621",
"editorPeekBorders": "#7777cc",
"editorPeekReferenceHighlight": "#ddbb5555",
"editorPeekEditorMatchHighlight": "#ddbb5555",
"editorLineNumbers": "#406385",
"editorMarkerNavigationBackground": "#060621",
extensions/theme-quietlight/themes/quietlight-color-theme.json
+2 -2
View File
@@ -467,11 +467,11 @@
"inputBackground": "#F5F5F5",
"editorFindMatch": "#BF9CAC",
"editorFindMatchHighlight": "#edc9d8",
"editorPeekReferenceHighlight": "#C2DFE3",
"editorPeekEditorMatchHighlight": "#C2DFE3",
"editorPeekTitleBackground": "#F2F8FC",
"editorPeekEditorBackground": "#F2F8FC",
"editorPeekResultsBackground": "#F2F8FC",
"editorPeekFindMatchHighlight": "#93C6D6",
"editorPeekResultsMatchHighlight": "#93C6D6",
"activityBadgeBackground": "#705697"
}
}
extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
+1 -1
View File
@@ -327,7 +327,7 @@
"editorPeekResultsBackground": "#00212B",
"editorPeekTitleBackground": "#00212B",
"editorPeekReferenceHighlight": "#7744AA40",
"editorPeekEditorMatchHighlight": "#7744AA40",
"editorHoverBackground": "#004052"
}
}
src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts
+10 -10
View File
@@ -780,23 +780,23 @@ export const editorPeekTitle = registerColor('editorPeekTitle', { dark: '#FFFFFF
export const editorPeekTitleInfo = registerColor('editorPeekTitleInfo', { dark: '#ccccccb3', light: '#6c6c6cb3', hc: '#FFFFFF99' }, nls.localize('editorPeekTitleInfo', 'Editor peek view title info color'));
export const editorPeekBorders = registerColor('editorPeekBorders', { dark: '#007acc', light: '#007acc', hc: '#6FC3DF' }, nls.localize('editorPeekBorders', 'Editor peek view borders'));
export const editorPeekResultsBackground = registerColor('editorPeekResultsBackground', { dark: '#252526', light: '#F3F3F3', hc: Color.black }, nls.localize('editorPeekResultsBackground', 'List background in the editor peek view'));
export const editorPeekResultsMatchForeground = registerColor('editorPeekResultsMatchForeground', { dark: '#bbbbbb', light: '#646465', hc: Color.white }, nls.localize('editorPeekResultsMatchForeground', 'Match entry foreground in the editor peek view'));
export const editorPeekResultsFileForeground = registerColor('editorPeekResultsFileForeground', { dark: Color.white, light: '#1E1E1E', hc: Color.white }, nls.localize('editorPeekResultsFileForeground', 'File entry foreground in the editor peek view'));
export const editorPeekResultsSelectedBackground = registerColor('editorPeekResultsSelectedBackground', { dark: '#3399ff33', light: '#3399ff33', hc: null }, nls.localize('editorPeekResultsSelectedBackground', 'Selected entry background in the editor peek view'));
export const editorPeekResultsSelectedForeground = registerColor('editorPeekResultsSelectedForeground', { dark: Color.white, light: '#6C6C6C', hc: Color.white }, nls.localize('editorPeekResultsSelectedForeground', 'Selected entry foreground in the editor peek view'));
export const editorPeekEditorBackground = registerColor('editorPeekEditorBackground', { dark: '#001F33', light: '#F2F8FC', hc: '#0C141F' }, nls.localize('editorPeekEditorBackground', 'Editor background in the editor peek view'));
export const editorPeekResultsBackground = registerColor('editorPeekResultsBackground', { dark: '#252526', light: '#F3F3F3', hc: Color.black }, nls.localize('editorPeekResultsBackground', 'Background color of the peek view result list'));
export const editorPeekResultsMatchForeground = registerColor('editorPeekResultsMatchForeground', { dark: '#bbbbbb', light: '#646465', hc: Color.white }, nls.localize('editorPeekResultsMatchForeground', 'Match entry foreground in the peek view result list'));
export const editorPeekResultsFileForeground = registerColor('editorPeekResultsFileForeground', { dark: Color.white, light: '#1E1E1E', hc: Color.white }, nls.localize('editorPeekResultsFileForeground', 'File entry foreground in the peek view result list'));
export const editorPeekResultsSelectedBackground = registerColor('editorPeekResultsSelectedBackground', { dark: '#3399ff33', light: '#3399ff33', hc: null }, nls.localize('editorPeekResultsSelectedBackground', 'Selected entry background in the peek view result list'));
export const editorPeekResultsSelectedForeground = registerColor('editorPeekResultsSelectedForeground', { dark: Color.white, light: '#6C6C6C', hc: Color.white }, nls.localize('editorPeekResultsSelectedForeground', 'Selected entry foreground in the peek view result list'));
export const editorPeekEditorBackground = registerColor('editorPeekEditorBackground', { dark: '#001F33', light: '#F2F8FC', hc: '#0C141F' }, nls.localize('editorPeekEditorBackground', 'Background color of the peek view editor'));
export const editorPeekFindMatchHighlight = registerColor('editorPeekFindMatchHighlight', { dark: '#ea5c004d', light: '#ea5c004d', hc: null }, nls.localize('editorPeekFindMatchHighlight', 'Match highlight color in the peek view matches list'));
export const editorPeekReferenceHighlight = registerColor('editorPeekReferenceHighlight', { dark: '#ff8f0099', light: '#f5d802de', hc: null }, nls.localize('editorPeekReferenceHighlight', 'Match highlight color in the peek view editor'));
export const editorPeekResultsMatchHighlight = registerColor('editorPeekResultsMatchHighlight', { dark: '#ea5c004d', light: '#ea5c004d', hc: null }, nls.localize('editorPeekResultsMatchHighlight', 'Match highlight color in the peek view result list'));
export const editorPeekEditorMatchHighlight = registerColor('editorPeekEditorMatchHighlight', { dark: '#ff8f0099', light: '#f5d802de', hc: null }, nls.localize('editorPeekEditorMatchHighlight', 'Match highlight color in the peek view editor'));
registerThemingParticipant((theme, collector) => {
let findMatchHighlightColor = theme.getColor(editorPeekFindMatchHighlight);
let findMatchHighlightColor = theme.getColor(editorPeekResultsMatchHighlight);
if (findMatchHighlightColor) {
collector.addRule(`.monaco-editor.${theme.selector} .reference-zone-widget .ref-tree .referenceMatch { background-color: ${findMatchHighlightColor}; }`);
}
let referenceHighlightColor = theme.getColor(editorPeekReferenceHighlight);
let referenceHighlightColor = theme.getColor(editorPeekEditorMatchHighlight);
if (referenceHighlightColor) {
collector.addRule(`.monaco-editor.${theme.selector} .reference-zone-widget .preview .reference-decoration { background-color: ${referenceHighlightColor}; }`);
}
src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts
+3 -3
View File
@@ -11,7 +11,7 @@ import * as editorColorRegistry from 'vs/editor/common/view/editorColorRegistry'
import * as wordHighlighter from 'vs/editor/contrib/wordHighlighter/common/wordHighlighter';
import { ansiColorIdentifiers } from 'vs/workbench/parts/terminal/electron-browser/terminalColorRegistry';
import { editorHoverHighlight } from 'vs/editor/contrib/hover/browser/hover';
import { editorPeekReferenceHighlight, editorPeekFindMatchHighlight } from 'vs/editor/contrib/referenceSearch/browser/referencesWidget';
import { editorPeekEditorMatchHighlight, editorPeekResultsMatchHighlight } from 'vs/editor/contrib/referenceSearch/browser/referencesWidget';
const settingToColorIdMapping: { [settingId: string]: string[] } = {};
function addSettingMapping(settingId: string, colorId: string) {
@@ -61,8 +61,8 @@ addSettingMapping('linkForeground', colorRegistry.editorLinkForeground);
addSettingMapping('wordHighlight', wordHighlighter.editorWordHighlight);
addSettingMapping('wordHighlightStrong', wordHighlighter.editorWordHighlightStrong);
addSettingMapping('findRangeHighlight', colorRegistry.editorFindRangeHighlight);
addSettingMapping('findMatchHighlight', editorPeekFindMatchHighlight);
addSettingMapping('referenceHighlight', editorPeekReferenceHighlight);
addSettingMapping('findMatchHighlight', editorPeekResultsMatchHighlight);
addSettingMapping('referenceHighlight', editorPeekEditorMatchHighlight);
addSettingMapping('lineHighlight', editorColorRegistry.editorLineHighlight);
addSettingMapping('rangeHighlight', editorColorRegistry.editorRangeHighlight);
addSettingMapping('caret', editorColorRegistry.editorCursor);