Merge remote-tracking branch 'upstream/develop' into ts

This commit is contained in:
OctoD 2017-05-25 09:18:08 +02:00
commit f80833cde6
9 changed files with 25 additions and 16 deletions

View file

@ -21,8 +21,9 @@
"scrollbars": "#00000050",
"scrollbarsHover": "#00000030",
"statusbarForeground": "#4A4A4A",
"sidebarForeground": "#EEFFFF70",
"sidebarForeground": "#4A4A4A",
"listHoverForeground": "#FFFFFF",
"tabActiveForeground": "#FFFFFF",
"base": {
"white": "#ffffff",
"black": "#000000",

View file

@ -21,8 +21,9 @@
"scrollbars": "#00000050",
"scrollbarsHover": "#00000030",
"statusbarForeground": "#546E7A",
"sidebarForeground": "#EEFFFF70",
"sidebarForeground": "#546E7A",
"listHoverForeground": "#FFFFFF",
"tabActiveForeground": "#FFFFFF",
"base": {
"white": "#ffffff",
"black": "#000000",

View file

@ -23,6 +23,7 @@
"statusbarForeground": "#90A4AE",
"sidebarForeground": "#7E939E",
"listHoverForeground": "#B1C7D3",
"tabActiveForeground": "#000000",
"base": {
"white": "#FFFFFF",
"black": "#000000",

View file

@ -21,8 +21,9 @@
"scrollbars": "#00000050",
"scrollbarsHover": "#00000030",
"statusbarForeground": "#676E95",
"sidebarForeground": "#A6ACCD80",
"sidebarForeground": "#676E95",
"listHoverForeground": "#FFFFFF",
"tabActiveForeground": "#FFFFFF",
"base": {
"white": "#ffffff",
"black": "#000000",

View file

@ -695,7 +695,7 @@
"editorIndentGuide.background": "{{variant.scheme.guides}}",
"editorGroupHeader.tabsBackground": "{{variant.scheme.background}}",
"editorGroup.border": "{{variant.scheme.shadow}}",
"tab.activeForeground": "{{variant.scheme.foreground}}",
"tab.activeForeground": "{{variant.scheme.tabActiveForeground}}",
"tab.inactiveForeground": "{{variant.scheme.comments}}",
"tab.inactiveBackground": "{{variant.scheme.background}}",
"tab.border": "{{variant.scheme.background}}",
@ -716,7 +716,7 @@
"sideBarSectionHeader.background": "{{variant.scheme.background}}",
"input.background": "{{variant.scheme.inputBackground}}",
"input.foreground": "{{variant.scheme.inputForeground}}",
"input.placeholderForeground": "{{variant.scheme.foreground}}",
"input.placeholderForeground": "{{variant.scheme.foreground}}60",
"input.border": "{{variant.scheme.inputBorder}}",
"inputValidation.errorBorder": "{{variant.scheme.base.red}}",
"inputValidation.infoBorder": "{{variant.scheme.base.blue}}",
@ -727,6 +727,7 @@
"list.hoverBackground": "{{variant.scheme.background}}",
"list.activeSelectionBackground": "{{variant.scheme.background}}",
"list.activeSelectionForeground": "{{commons.accents.teal}}",
"list.inactiveSelectionForeground": "{{commons.accents.teal}}",
"list.inactiveSelectionBackground": "{{variant.scheme.background}}",
"list.focusBackground": "{{variant.scheme.foreground}}10",
"list.focusForeground": "{{variant.scheme.foreground}}",

View file

@ -695,7 +695,7 @@
"editorIndentGuide.background": "#42424270",
"editorGroupHeader.tabsBackground": "#212121",
"editorGroup.border": "#00000030",
"tab.activeForeground": "#EEFFFF",
"tab.activeForeground": "#FFFFFF",
"tab.inactiveForeground": "#4A4A4A",
"tab.inactiveBackground": "#212121",
"tab.border": "#212121",
@ -711,12 +711,12 @@
"titleBar.inactiveBackground": "#212121",
"titleBar.inactiveForeground": "#4A4A4A",
"sideBar.background": "#212121",
"sideBar.foreground": "#EEFFFF70",
"sideBar.foreground": "#4A4A4A",
"sideBarTitle.foreground": "#EEFFFF",
"sideBarSectionHeader.background": "#212121",
"input.background": "#FFFFFF05",
"input.foreground": "#EEFFFF",
"input.placeholderForeground": "#EEFFFF",
"input.placeholderForeground": "#EEFFFF60",
"input.border": "#FFFFFF10",
"inputValidation.errorBorder": "#FF5370",
"inputValidation.infoBorder": "#82AAFF",
@ -727,6 +727,7 @@
"list.hoverBackground": "#212121",
"list.activeSelectionBackground": "#212121",
"list.activeSelectionForeground": "#80CBC4",
"list.inactiveSelectionForeground": "#80CBC4",
"list.inactiveSelectionBackground": "#212121",
"list.focusBackground": "#EEFFFF10",
"list.focusForeground": "#EEFFFF",

View file

@ -695,7 +695,7 @@
"editorIndentGuide.background": "#37474F80",
"editorGroupHeader.tabsBackground": "#263238",
"editorGroup.border": "#00000030",
"tab.activeForeground": "#EEFFFF",
"tab.activeForeground": "#FFFFFF",
"tab.inactiveForeground": "#546E7A",
"tab.inactiveBackground": "#263238",
"tab.border": "#263238",
@ -711,12 +711,12 @@
"titleBar.inactiveBackground": "#263238",
"titleBar.inactiveForeground": "#546E7A",
"sideBar.background": "#263238",
"sideBar.foreground": "#EEFFFF70",
"sideBar.foreground": "#546E7A",
"sideBarTitle.foreground": "#EEFFFF",
"sideBarSectionHeader.background": "#263238",
"input.background": "#FFFFFF05",
"input.foreground": "#EEFFFF",
"input.placeholderForeground": "#EEFFFF",
"input.placeholderForeground": "#EEFFFF60",
"input.border": "#FFFFFF10",
"inputValidation.errorBorder": "#FF5370",
"inputValidation.infoBorder": "#82AAFF",
@ -727,6 +727,7 @@
"list.hoverBackground": "#263238",
"list.activeSelectionBackground": "#263238",
"list.activeSelectionForeground": "#80CBC4",
"list.inactiveSelectionForeground": "#80CBC4",
"list.inactiveSelectionBackground": "#263238",
"list.focusBackground": "#EEFFFF10",
"list.focusForeground": "#EEFFFF",

View file

@ -695,7 +695,7 @@
"editorIndentGuide.background": "#B0BEC570",
"editorGroupHeader.tabsBackground": "#FAFAFA",
"editorGroup.border": "#00000020",
"tab.activeForeground": "#90A4AE",
"tab.activeForeground": "#000000",
"tab.inactiveForeground": "#90A4AE90",
"tab.inactiveBackground": "#FAFAFA",
"tab.border": "#FAFAFA",
@ -716,7 +716,7 @@
"sideBarSectionHeader.background": "#FAFAFA",
"input.background": "#00000005",
"input.foreground": "#90A4AE",
"input.placeholderForeground": "#90A4AE",
"input.placeholderForeground": "#90A4AE60",
"input.border": "#00000010",
"inputValidation.errorBorder": "#E53935",
"inputValidation.infoBorder": "#6182B8",
@ -727,6 +727,7 @@
"list.hoverBackground": "#FAFAFA",
"list.activeSelectionBackground": "#FAFAFA",
"list.activeSelectionForeground": "#80CBC4",
"list.inactiveSelectionForeground": "#80CBC4",
"list.inactiveSelectionBackground": "#FAFAFA",
"list.focusBackground": "#90A4AE10",
"list.focusForeground": "#90A4AE",

View file

@ -695,7 +695,7 @@
"editorIndentGuide.background": "#4E557980",
"editorGroupHeader.tabsBackground": "#292D3E",
"editorGroup.border": "#00000030",
"tab.activeForeground": "#A6ACCD",
"tab.activeForeground": "#FFFFFF",
"tab.inactiveForeground": "#676E95",
"tab.inactiveBackground": "#292D3E",
"tab.border": "#292D3E",
@ -711,12 +711,12 @@
"titleBar.inactiveBackground": "#292D3E",
"titleBar.inactiveForeground": "#676E95",
"sideBar.background": "#292D3E",
"sideBar.foreground": "#A6ACCD80",
"sideBar.foreground": "#676E95",
"sideBarTitle.foreground": "#A6ACCD",
"sideBarSectionHeader.background": "#292D3E",
"input.background": "#FFFFFF05",
"input.foreground": "#EEFFFF",
"input.placeholderForeground": "#A6ACCD",
"input.placeholderForeground": "#A6ACCD60",
"input.border": "#FFFFFF10",
"inputValidation.errorBorder": "#FF5370",
"inputValidation.infoBorder": "#82AAFF",
@ -727,6 +727,7 @@
"list.hoverBackground": "#292D3E",
"list.activeSelectionBackground": "#292D3E",
"list.activeSelectionForeground": "#80CBC4",
"list.inactiveSelectionForeground": "#80CBC4",
"list.inactiveSelectionBackground": "#292D3E",
"list.focusBackground": "#A6ACCD10",
"list.focusForeground": "#A6ACCD",