chore: Merges remote

This commit is contained in:
OctoD 2017-06-02 15:15:55 +02:00
commit 49c1f0c78b
8 changed files with 553 additions and 32 deletions

View file

@ -11,6 +11,7 @@ let accentsProperties: IGenericObject<string> = {
"list.highlightForeground": undefined,
"scrollbarSlider.activeBackground": undefined,
"editorSuggestWidget.highlightForeground": undefined,
"textLink.foreground": undefined,
}
/**

View file

@ -48,7 +48,7 @@
{
"category": "Material theme",
"command": "material.theme.config",
"title": "Material theme settings"
"title": "Settings"
}
],
"themes": [
@ -115,7 +115,7 @@
"rimraf": "^2.6.1",
"run-sequence": "^1.2.2",
"svgo": "^0.7.1",
"typescript": "2.3.3",
"typescript": "2.3.4",
"vscode": "^1.1.0",
"yamljs": "^0.2.10",
"yargs": "^7.1.0"

View file

@ -683,7 +683,8 @@
"scrollbar.shadow": "{{variant.scheme.background}}00",
"editorLink.activeForeground": "{{variant.scheme.foreground}}",
"selection.background": "{{variant.scheme.foreground}}",
"textLink.foreground": "{{commons.accents.teal}}",
"textLink.foreground": "{{commons.accents.Teal}}",
"textLink.activeForeground": "{{variant.scheme.foreground}}",
"editorLineNumber.foreground": "{{variant.scheme.lineNumbers}}",
"editorBracketMatch.border": "{{variant.scheme.caret}}",
"editor.background": "{{variant.scheme.background}}",

View file

@ -684,6 +684,7 @@
"editorLink.activeForeground": "#EEFFFF",
"selection.background": "#EEFFFF",
"textLink.foreground": "#80CBC4",
"textLink.activeForeground": "#EEFFFF",
"editorLineNumber.foreground": "#424242",
"editorBracketMatch.border": "#FFCC00",
"editor.background": "#212121",

View file

@ -684,6 +684,7 @@
"editorLink.activeForeground": "#EEFFFF",
"selection.background": "#EEFFFF",
"textLink.foreground": "#80CBC4",
"textLink.activeForeground": "#EEFFFF",
"editorLineNumber.foreground": "#37474F",
"editorBracketMatch.border": "#FFCC00",
"editor.background": "#263238",

View file

@ -684,6 +684,7 @@
"editorLink.activeForeground": "#90A4AE",
"selection.background": "#90A4AE",
"textLink.foreground": "#80CBC4",
"textLink.activeForeground": "#90A4AE",
"editorLineNumber.foreground": "#CFD8DC",
"editorBracketMatch.border": "#272727",
"editor.background": "#FAFAFA",

View file

@ -684,6 +684,7 @@
"editorLink.activeForeground": "#A6ACCD",
"selection.background": "#A6ACCD",
"textLink.foreground": "#80CBC4",
"textLink.activeForeground": "#A6ACCD",
"editorLineNumber.foreground": "#3A3F58",
"editorBracketMatch.border": "#FFCC00",
"editor.background": "#292D3E",

573
yarn.lock

File diff suppressed because it is too large Load diff