chore: Merge from upstream/master

This commit is contained in:
OctoD 2017-05-22 10:22:26 +02:00
commit 77885e48e5
15 changed files with 95 additions and 28 deletions

View file

@ -1,3 +1,38 @@
<a name="0.0.17"></a>
## [0.0.17](https://github.com/equinusocio/vsc-material-theme/compare/v0.0.16...v0.0.17) (2017-05-22)
### Bug Fixes
* Fix inactive group inactive tab foreground ([cc2a376](https://github.com/equinusocio/vsc-material-theme/commit/cc2a376)), closes [#47](https://github.com/equinusocio/vsc-material-theme/issues/47)
* Improve sidebar colorization ([9ce89ab](https://github.com/equinusocio/vsc-material-theme/commit/9ce89ab))
### Features
* Add puppet (.pp) file icon ([e2a04a8](https://github.com/equinusocio/vsc-material-theme/commit/e2a04a8))
<a name="0.0.16"></a>
## [0.0.16](https://github.com/equinusocio/vsc-material-theme/compare/v0.0.15...v0.0.16) (2017-05-18)
### Bug Fixes
* Fix C file icon ([150e7df](https://github.com/equinusocio/vsc-material-theme/commit/150e7df)), closes [#46](https://github.com/equinusocio/vsc-material-theme/issues/46)
* Fix the waterfall of bleed words ([df893af](https://github.com/equinusocio/vsc-material-theme/commit/df893af)), closes [#44](https://github.com/equinusocio/vsc-material-theme/issues/44)
* Fix the waterfall of blooding words ([938fb73](https://github.com/equinusocio/vsc-material-theme/commit/938fb73)), closes [#44](https://github.com/equinusocio/vsc-material-theme/issues/44)
* Improve tree colors (wip) ([7e7980c](https://github.com/equinusocio/vsc-material-theme/commit/7e7980c))
* Panel hover borders ([55b07cf](https://github.com/equinusocio/vsc-material-theme/commit/55b07cf))
<a name="0.0.15"></a>
## [0.0.15](https://github.com/equinusocio/vsc-material-theme/compare/v0.0.14...v0.0.15) (2017-05-17)
<a name="0.0.14"></a>
## [0.0.14](https://github.com/equinusocio/vsc-material-theme/compare/v0.0.13...v0.0.14) (2017-05-16)

1
icons/pp.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="33" height="32" viewBox="0 0 33 32"><g fill="#F4BF75" fill-rule="nonzero"><path d="M19.535 11.596h5.422v6.812h-5.262l-4.39 4.232-1.724-1.66 4.31-4.154v-3.493l-3.12-3.008 1.722-1.66 3.042 2.931z"/><path d="M13.914 5.636h-2.209v2.13h2.21v-2.13zm2.65 4.683H9.056V3.08h7.51v7.238zM13.914 22.24h-2.209v2.13h2.21v-2.13zm2.65 4.683H9.056v-7.237h7.51v7.237z"/></g></svg>

After

Width:  |  Height:  |  Size: 409 B

View file

@ -2,7 +2,7 @@
"name": "vsc-material-theme",
"displayName": "Material Theme",
"description": "The most epic theme now for Visual Studio Code",
"version": "0.0.16",
"version": "0.0.17",
"preview": true,
"publisher": "Equinusocio",
"license": "Apache-2.0",

View file

@ -262,5 +262,6 @@
"cmx": "_file_ocaml",
"js.map": "_file_jsmap",
"css.map": "_file_cssmap",
"tmTheme": "_file_markup"
"tmTheme": "_file_markup",
"pp": "_file_pp"
},

7
src/icons/svgs/pp.svg Normal file
View file

@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="33" height="32" viewBox="0 0 33 32">
<g fill="none" fill-rule="evenodd" transform="translate(9 3)">
<path fill="#F4BF75" fill-rule="nonzero" d="M10.5350981,8.596483 L15.9573837,8.596483 L15.9573837,15.4079531 L10.6953054,15.4079531 L6.30440464,19.640034 L4.58139878,17.9793497 L8.89029551,13.8263066 L8.89029551,10.332542 L5.77011158,7.32521579 L7.49311743,5.66453143 L10.5350981,8.596483 Z"/>
<path fill="#F4BF75" fill-rule="nonzero" d="M4.91448253,2.63644666 L2.70544161,2.63644666 L2.70544161,4.76558611 L4.91448253,4.76558611 L4.91448253,2.63644666 Z M7.5646406,7.31877731 L0.0552835391,7.31877731 L0.0552835391,0.0810352908 L7.5646406,0.0810352908 L7.5646406,7.31877731 Z"/>
<path fill="#F4BF75" fill-rule="nonzero" d="M4.91448253,19.2399601 L2.70544161,19.2399601 L2.70544161,21.3690995 L4.91448253,21.3690995 L4.91448253,19.2399601 Z M7.5646406,23.9234008 L0.0552835391,23.9234008 L0.0552835391,16.6856588 L7.5646406,16.6856588 L7.5646406,23.9234008 Z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1 KiB

View file

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

View file

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

View file

@ -21,6 +21,8 @@
"scrollbars": "#00000050",
"scrollbarsHover": "#00000030",
"statusbarForeground": "#90A4AE",
"sidebarForeground": "#7E939E",
"listHoverForeground": "#B1C7D3",
"base": {
"white": "#FFFFFF",
"black": "#000000",

View file

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

View file

@ -695,8 +695,9 @@
"editorIndentGuide.background": "{{variant.scheme.guides}}",
"editorGroupHeader.tabsBackground": "{{variant.scheme.background}}",
"editorGroup.border": "{{variant.scheme.shadow}}",
"tab.inactiveBackground": "{{variant.scheme.background}}",
"tab.activeForeground": "{{variant.scheme.foreground}}",
"tab.inactiveForeground": "{{variant.scheme.comments}}",
"tab.inactiveBackground": "{{variant.scheme.background}}",
"tab.border": "{{variant.scheme.background}}",
"statusBar.background": "{{variant.scheme.background}}",
"statusBar.noFolderBackground": "{{variant.scheme.background}}",
@ -710,6 +711,7 @@
"titleBar.inactiveBackground": "{{variant.scheme.background}}",
"titleBar.inactiveForeground": "{{variant.scheme.comments}}",
"sideBar.background": "{{variant.scheme.background}}",
"sideBar.foreground": "{{variant.scheme.sidebarForeground}}",
"sideBarTitle.foreground": "{{variant.scheme.foreground}}",
"sideBarSectionHeader.background": "{{variant.scheme.background}}",
"input.background": "{{variant.scheme.inputBackground}}",
@ -721,13 +723,14 @@
"inputValidation.warningBorder": "{{variant.scheme.base.yellow}}",
"dropdown.background": "{{variant.scheme.background}}",
"dropdown.border": "{{variant.scheme.inputBorder}}",
"list.hoverForeground": "{{commons.accents.teal}}",
"list.hoverForeground": "{{variant.scheme.listHoverForeground}}",
"list.hoverBackground": "{{variant.scheme.background}}",
"list.activeSelectionBackground": "{{variant.scheme.lineHighlight}}50",
"list.activeSelectionBackground": "{{variant.scheme.background}}",
"list.activeSelectionForeground": "{{commons.accents.teal}}",
"list.inactiveSelectionBackground": "{{variant.scheme.lineHighlight}}50",
"list.inactiveSelectionBackground": "{{variant.scheme.background}}",
"list.focusBackground": "{{variant.scheme.foreground}}10",
"list.focusForeground": "{{variant.scheme.foreground}}",
"list.highlightForeground": "{{commons.accents.teal}}",
"list.focusBackground": "{{variant.scheme.lineNumbers}}",
"terminal.ansiWhite": "{{variant.scheme.base.white}}",
"terminal.ansiBlack": "{{variant.scheme.comments}}",
"terminal.ansiBlue": "{{variant.scheme.base.blue}}",

View file

@ -695,8 +695,9 @@
"editorIndentGuide.background": "#42424270",
"editorGroupHeader.tabsBackground": "#212121",
"editorGroup.border": "#00000030",
"tab.inactiveBackground": "#212121",
"tab.activeForeground": "#EEFFFF",
"tab.inactiveForeground": "#4A4A4A",
"tab.inactiveBackground": "#212121",
"tab.border": "#212121",
"statusBar.background": "#212121",
"statusBar.noFolderBackground": "#212121",
@ -710,6 +711,7 @@
"titleBar.inactiveBackground": "#212121",
"titleBar.inactiveForeground": "#4A4A4A",
"sideBar.background": "#212121",
"sideBar.foreground": "#EEFFFF70",
"sideBarTitle.foreground": "#EEFFFF",
"sideBarSectionHeader.background": "#212121",
"input.background": "#FFFFFF05",
@ -721,13 +723,14 @@
"inputValidation.warningBorder": "#FFCB6B",
"dropdown.background": "#212121",
"dropdown.border": "#FFFFFF10",
"list.hoverForeground": "#80CBC4",
"list.hoverForeground": "#FFFFFF",
"list.hoverBackground": "#212121",
"list.activeSelectionBackground": "#00000050",
"list.activeSelectionBackground": "#212121",
"list.activeSelectionForeground": "#80CBC4",
"list.inactiveSelectionBackground": "#00000050",
"list.inactiveSelectionBackground": "#212121",
"list.focusBackground": "#EEFFFF10",
"list.focusForeground": "#EEFFFF",
"list.highlightForeground": "#80CBC4",
"list.focusBackground": "#424242",
"terminal.ansiWhite": "#ffffff",
"terminal.ansiBlack": "#4A4A4A",
"terminal.ansiBlue": "#82AAFF",

View file

@ -695,8 +695,9 @@
"editorIndentGuide.background": "#37474F80",
"editorGroupHeader.tabsBackground": "#263238",
"editorGroup.border": "#00000030",
"tab.inactiveBackground": "#263238",
"tab.activeForeground": "#EEFFFF",
"tab.inactiveForeground": "#546E7A",
"tab.inactiveBackground": "#263238",
"tab.border": "#263238",
"statusBar.background": "#263238",
"statusBar.noFolderBackground": "#263238",
@ -710,6 +711,7 @@
"titleBar.inactiveBackground": "#263238",
"titleBar.inactiveForeground": "#546E7A",
"sideBar.background": "#263238",
"sideBar.foreground": "#EEFFFF70",
"sideBarTitle.foreground": "#EEFFFF",
"sideBarSectionHeader.background": "#263238",
"input.background": "#FFFFFF05",
@ -721,13 +723,14 @@
"inputValidation.warningBorder": "#FFCB6B",
"dropdown.background": "#263238",
"dropdown.border": "#FFFFFF10",
"list.hoverForeground": "#80CBC4",
"list.hoverForeground": "#FFFFFF",
"list.hoverBackground": "#263238",
"list.activeSelectionBackground": "#00000050",
"list.activeSelectionBackground": "#263238",
"list.activeSelectionForeground": "#80CBC4",
"list.inactiveSelectionBackground": "#00000050",
"list.inactiveSelectionBackground": "#263238",
"list.focusBackground": "#EEFFFF10",
"list.focusForeground": "#EEFFFF",
"list.highlightForeground": "#80CBC4",
"list.focusBackground": "#37474F",
"terminal.ansiWhite": "#ffffff",
"terminal.ansiBlack": "#546E7A",
"terminal.ansiBlue": "#82AAFF",

File diff suppressed because one or more lines are too long

View file

@ -695,8 +695,9 @@
"editorIndentGuide.background": "#B0BEC570",
"editorGroupHeader.tabsBackground": "#FAFAFA",
"editorGroup.border": "#00000020",
"tab.inactiveBackground": "#FAFAFA",
"tab.activeForeground": "#90A4AE",
"tab.inactiveForeground": "#90A4AE90",
"tab.inactiveBackground": "#FAFAFA",
"tab.border": "#FAFAFA",
"statusBar.background": "#FAFAFA",
"statusBar.noFolderBackground": "#FAFAFA",
@ -710,6 +711,7 @@
"titleBar.inactiveBackground": "#FAFAFA",
"titleBar.inactiveForeground": "#90A4AE90",
"sideBar.background": "#FAFAFA",
"sideBar.foreground": "#7E939E",
"sideBarTitle.foreground": "#90A4AE",
"sideBarSectionHeader.background": "#FAFAFA",
"input.background": "#00000005",
@ -721,13 +723,14 @@
"inputValidation.warningBorder": "#FFB62C",
"dropdown.background": "#FAFAFA",
"dropdown.border": "#00000010",
"list.hoverForeground": "#80CBC4",
"list.hoverForeground": "#B1C7D3",
"list.hoverBackground": "#FAFAFA",
"list.activeSelectionBackground": "#CCD7DA50",
"list.activeSelectionBackground": "#FAFAFA",
"list.activeSelectionForeground": "#80CBC4",
"list.inactiveSelectionBackground": "#CCD7DA50",
"list.inactiveSelectionBackground": "#FAFAFA",
"list.focusBackground": "#90A4AE10",
"list.focusForeground": "#90A4AE",
"list.highlightForeground": "#80CBC4",
"list.focusBackground": "#CFD8DC",
"terminal.ansiWhite": "#FFFFFF",
"terminal.ansiBlack": "#90A4AE90",
"terminal.ansiBlue": "#6182B8",

View file

@ -695,8 +695,9 @@
"editorIndentGuide.background": "#4E557980",
"editorGroupHeader.tabsBackground": "#292D3E",
"editorGroup.border": "#00000030",
"tab.inactiveBackground": "#292D3E",
"tab.activeForeground": "#A6ACCD",
"tab.inactiveForeground": "#676E95",
"tab.inactiveBackground": "#292D3E",
"tab.border": "#292D3E",
"statusBar.background": "#292D3E",
"statusBar.noFolderBackground": "#292D3E",
@ -710,6 +711,7 @@
"titleBar.inactiveBackground": "#292D3E",
"titleBar.inactiveForeground": "#676E95",
"sideBar.background": "#292D3E",
"sideBar.foreground": "#A6ACCD80",
"sideBarTitle.foreground": "#A6ACCD",
"sideBarSectionHeader.background": "#292D3E",
"input.background": "#FFFFFF05",
@ -721,13 +723,14 @@
"inputValidation.warningBorder": "#FFCB6B",
"dropdown.background": "#292D3E",
"dropdown.border": "#FFFFFF10",
"list.hoverForeground": "#80CBC4",
"list.hoverForeground": "#FFFFFF",
"list.hoverBackground": "#292D3E",
"list.activeSelectionBackground": "#00000050",
"list.activeSelectionBackground": "#292D3E",
"list.activeSelectionForeground": "#80CBC4",
"list.inactiveSelectionBackground": "#00000050",
"list.inactiveSelectionBackground": "#292D3E",
"list.focusBackground": "#A6ACCD10",
"list.focusForeground": "#A6ACCD",
"list.highlightForeground": "#80CBC4",
"list.focusBackground": "#3A3F58",
"terminal.ansiWhite": "#ffffff",
"terminal.ansiBlack": "#676E95",
"terminal.ansiBlue": "#82AAFF",