ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-04-01 17:40:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a416c77e56ef0314ae00633faa04878151610de8 (#8600)

Browse Source 
* Merge from vscode a416c77e56ef0314ae00633faa04878151610de8

* distro

* fix tests

* fix tests
This commit is contained in:
Anthony Dresser
2019-12-07 17:19:16 -08:00
committed by GitHub
parent a7ff238653
commit d614116b63
155 changed files with 1982 additions and 1599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
View File

@@ -809,37 +809,37 @@ export class DirtyDiffController extends Disposable implements IEditorContributi
export const editorGutterModifiedBackground = registerColor('editorGutter.modifiedBackground', {
dark: new Color(new RGBA(12, 125, 157)),
light: new Color(new RGBA(102, 175, 224)),
hc: new Color(new RGBA(0, 73, 122))
hc: new Color(new RGBA(0, 155, 249))
}, nls.localize('editorGutterModifiedBackground', "Editor gutter background color for lines that are modified."));
export const editorGutterAddedBackground = registerColor('editorGutter.addedBackground', {
dark: new Color(new RGBA(88, 124, 12)),
light: new Color(new RGBA(129, 184, 139)),
hc: new Color(new RGBA(27, 82, 37))
hc: new Color(new RGBA(51, 171, 78))
}, nls.localize('editorGutterAddedBackground', "Editor gutter background color for lines that are added."));
export const editorGutterDeletedBackground = registerColor('editorGutter.deletedBackground', {
dark: new Color(new RGBA(148, 21, 27)),
light: new Color(new RGBA(202, 75, 81)),
hc: new Color(new RGBA(141, 14, 20))
hc: new Color(new RGBA(252, 93, 109))
}, nls.localize('editorGutterDeletedBackground', "Editor gutter background color for lines that are deleted."));
export const minimapGutterModifiedBackground = registerColor('minimapGutter.modifiedBackground', {
dark: new Color(new RGBA(12, 125, 157)),
light: new Color(new RGBA(102, 175, 224)),
hc: new Color(new RGBA(0, 73, 122))
hc: new Color(new RGBA(0, 155, 249))
}, nls.localize('minimapGutterModifiedBackground', "Minimap gutter background color for lines that are modified."));
export const minimapGutterAddedBackground = registerColor('minimapGutter.addedBackground', {
dark: new Color(new RGBA(88, 124, 12)),
light: new Color(new RGBA(129, 184, 139)),
hc: new Color(new RGBA(27, 82, 37))
hc: new Color(new RGBA(51, 171, 78))
}, nls.localize('minimapGutterAddedBackground', "Minimap gutter background color for lines that are added."));
export const minimapGutterDeletedBackground = registerColor('minimapGutter.deletedBackground', {
dark: new Color(new RGBA(148, 21, 27)),
light: new Color(new RGBA(202, 75, 81)),
hc: new Color(new RGBA(141, 14, 20))
hc: new Color(new RGBA(252, 93, 109))
}, nls.localize('minimapGutterDeletedBackground', "Minimap gutter background color for lines that are deleted."));
const overviewRulerDefault = new Color(new RGBA(0, 122, 204, 0.6));

7
src/vs/workbench/contrib/scm/browser/scm.contribution.ts
View File

@@ -81,6 +81,13 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
'scm.diffDecorations': {
type: 'string',
enum: ['all', 'gutter', 'overview', 'minimap', 'none'],
enumDescriptions: [
localize('scm.diffDecorations.all', "Show the diff decorations in all available locations."),
localize('scm.diffDecorations.gutter', "Show the diff decorations only in the editor gutter."),
localize('scm.diffDecorations.overviewRuler', "Show the diff decorations only in the overview ruler."),
localize('scm.diffDecorations.minimap', "Show the diff decorations only in the minimap."),
localize('scm.diffDecorations.none', "Do not show the diff decorations.")
],
default: 'all',
description: localize('diffDecorations', "Controls diff decorations in the editor.")
},