Merge Develop into Master (#320)

* Consistent styling throughout README (#314) (#315)

Instituted a consistent styling method throughout the README. Before, some phrases would be capitalized in some places and lowercase in others, some phrases would have colons in one place and commas in others, and some of the grammar was slightly off.

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* chore: Update stale configuration

* chore: Update deps

* fix: Add support to the new FilterWidget. Fix #316.

* fix(#312): Fix color highlighting for meta.tag elements

* chore: Prepare for 2.7.0

* chore: Update README

* fix: accent setter reborn (#319)

* Create CODEOWNERS
This commit is contained in:
Mattia Astorino 2019-02-11 11:02:29 +01:00 committed by GitHub
parent d729034881
commit 97aa537de1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 708 additions and 656 deletions

15
.github/CODEOWNERS vendored Normal file
View file

@ -0,0 +1,15 @@
# This is a comment.
# Each line is a file pattern followed by one or more owners.
# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
# @global-owner1 and @global-owner2 will be requested for
# review when someone opens a pull request.
* @equinusocio @LasaleFamine
# Order is important; the last matching pattern takes the most
# precedence. When someone opens a pull request that only
# modifies JS files, only @js-owner and not the global
# owner(s) will be requested for a review.
*.js @LasaleFamine
*.ts @LasaleFamine

5
.github/stale.yml vendored
View file

@ -1,5 +1,5 @@
# Number of days of inactivity before an issue becomes stale # Number of days of inactivity before an issue becomes stale
daysUntilStale: 60 daysUntilStale: 30
# Number of days of inactivity before a stale issue is closed # Number of days of inactivity before a stale issue is closed
daysUntilClose: 7 daysUntilClose: 7
# Issues with these labels will never be considered stale # Issues with these labels will never be considered stale
@ -14,4 +14,5 @@ markComment: >
recent activity. It will be closed if no further activity occurs. Thank you recent activity. It will be closed if no further activity occurs. Thank you
for your contributions. for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable # Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false closeComment: >
This issue has been closed due to inactivity.

View file

@ -1,26 +1,28 @@
<p align="center"><img width="980px" src="https://i.imgur.com/qvxc7OA.jpg"></p> <p align="center"><img width="800px" src="https://i.ibb.co/LzRwxp4/Frame.jpg"></p>
<p align="center">
<a href="https://code.visualstudio.com/updates/v1_25"><img src="https://vsmarketplacebadge.apphb.com/rating-star/Equinusocio.vsc-material-theme.svg?style=for-the-badge&colorA=FBBD30&colorB=F2AA08"/></a> <a href="https://marketplace.visualstudio.com/items?itemName=Equinusocio.vsc-material-theme"><img src="https://vsmarketplacebadge.apphb.com/installs-short/Equinusocio.vsc-material-theme.svg?style=for-the-badge&colorA=5DDB61&colorB=4BC74F&label=DOWNLOADS"/></a> <a href="https://a.paddle.com/v2/click/16413/37697?link=1227"><img src="https://img.shields.io/badge/Supported%20by-VSCode%20Power%20User%20Course%20%E2%86%92-gray.svg?colorA=655BE1&colorB=4F44D6&style=for-the-badge"/></a>
</p>
<a href="https://code.visualstudio.com/updates/v1_25"><img src="https://vsmarketplacebadge.apphb.com/rating-star/Equinusocio.vsc-material-theme.svg?style=for-the-badge&colorA=FBBD30&colorB=F2AA08"/></a> <a href="https://marketplace.visualstudio.com/items?itemName=Equinusocio.vsc-material-theme"><img src="https://vsmarketplacebadge.apphb.com/installs-short/Equinusocio.vsc-material-theme.svg?style=for-the-badge&colorA=5DDB61&colorB=4BC74F&label=DOWNLOADS"/></a>
[![VSCode.pro](https://img.shields.io/badge/Supported%20by-VSCode%20Power%20User%20Course%20%E2%86%92-gray.svg?colorA=655BE1&colorB=4F44D6&style=for-the-badge)]( https://a.paddle.com/v2/click/16413/37697?link=1227)
The most epic theme meets Visual Studio Code. You can help by reporting issues [here](https://github.com/equinusocio/vsc-material-theme/issues). The most epic theme meets Visual Studio Code. You can help by reporting issues [here](https://github.com/equinusocio/vsc-material-theme/issues).
- [Getting started](#getting-started) - [Getting started](#getting-started)
- [Installation](#installation) - [Installation](#installation)
- [Packaged VSIX Extension](#packaged-vsix-extension) - [Packaged VSIX Extension](#packaged-vsix-extension)
- [GitHub Repository Clone](#github-repository-clone) - [GitHub Repository Clone](#github-repository-clone)
- [Activate theme](#activate-theme) - [Activate theme](#activate-theme)
- [Set the accent color](#set-the-accent-color) - [Set the accent color](#set-the-accent-color)
- [Override theme colors](#override-theme-colors) - [Disabling/enabling file icons auto-applying](#disablingenabling-file-icons-auto-applying)
- [Color Scheme override](#color-scheme-override) - [Override theme colors](#override-theme-colors)
- [Color Scheme override](#color-scheme-override)
- [Recommended settings for a better experience](#recommended-settings-for-a-better-experience) - [Recommended settings for a better experience](#recommended-settings-for-a-better-experience)
- [Official Portings](#official-portings) - [Official Portings](#official-portings)
- [Other resources](#other-resources) - [Other resources](#other-resources)
- [Contributors](#contributors) - [Contributors](#contributors)
- [Backers](#backers) - [Backers](#backers)
- [Sponsors](#sponsors) - [Sponsors](#sponsors)
# Getting started # Getting started
@ -78,20 +80,6 @@ Launch *Quick Open*:
Type `theme`, choose `Preferences: Color Theme`, and select one of the Material Theme variants from the list. After activation, the theme will set the correct icon theme based on your active theme variant. Type `theme`, choose `Preferences: Color Theme`, and select one of the Material Theme variants from the list. After activation, the theme will set the correct icon theme based on your active theme variant.
## Fix File Icons
If you notice that the folder icons do not match the active Material Theme variant, you can fix it with just a command.
Launch *Quick Open*:
- <img src="https://www.kernel.org/theme/images/logos/favicon.png" width=16 height=16/> <a href="https://code.visualstudio.com/shortcuts/keyboard-shortcuts-linux.pdf">Linux</a> `Ctrl + Shift + P`
- <img src="https://developer.apple.com/favicon.ico" width=16 height=16/> <a href="https://code.visualstudio.com/shortcuts/keyboard-shortcuts-macos.pdf">macOS</a> `⌘ + Shift + P`
- <img src="https://www.microsoft.com/favicon.ico" width=16 height=16/> <a href="https://code.visualstudio.com/shortcuts/keyboard-shortcuts-windows.pdf">Windows</a> `Ctrl + Shift + P`
Type `material theme` and select `Material Theme: Fix file icons` from the drop-down menu. This command will set the correct icon theme based on your active Material Theme variant.
## Set the accent color ## Set the accent color
Launch *Quick Open*: Launch *Quick Open*:
@ -216,6 +204,6 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
--- ---
<p align="center"> <img src="https://equinusocio.gallerycdn.vsassets.io/extensions/equinusocio/vsc-material-theme/0.0.14/1494970083238/Microsoft.VisualStudio.Services.Icons.Default" width=16 height=16/> Copyright &copy; 2017 Mattia Astorino</p> <p align="center"> <img src="https://equinusocio.gallerycdn.vsassets.io/extensions/equinusocio/vsc-material-theme/0.0.14/1494970083238/Microsoft.VisualStudio.Services.Icons.Default" width=16 height=16/> Copyright &copy; 2019 Mattia Astorino & Alessio Occhipinti</p>
<p align="center"><a href="http://www.apache.org/licenses/LICENSE-2.0"><img src="https://img.shields.io/badge/License-Apache_2.0-5E81AC.svg?style=flat-square"/></a></p> <p align="center"><a href="http://www.apache.org/licenses/LICENSE-2.0"><img src="https://img.shields.io/badge/License-Apache_2.0-5E81AC.svg?style=flat-square"/></a></p>

View file

@ -96,7 +96,7 @@
} }
}, },
"changelog": { "changelog": {
"lastversion": "2.6.3" "lastversion": "2.7.0"
}, },
"themeVariants": { "themeVariants": {
"Darker": "./themes/Material-Theme-Darker.json", "Darker": "./themes/Material-Theme-Darker.json",
@ -134,4 +134,4 @@
"Ocean": "vs-dark", "Ocean": "vs-dark",
"Ocean High Contrast": "vs-dark" "Ocean High Contrast": "vs-dark"
} }
} }

View file

@ -2,7 +2,7 @@
"name": "vsc-material-theme", "name": "vsc-material-theme",
"displayName": "Material Theme", "displayName": "Material Theme",
"description": "The most epic theme now for Visual Studio Code", "description": "The most epic theme now for Visual Studio Code",
"version": "2.6.3", "version": "2.7.0",
"publisher": "Equinusocio", "publisher": "Equinusocio",
"license": "Apache-2.0", "license": "Apache-2.0",
"author": "Mattia Astorino [@equinusocio]", "author": "Mattia Astorino [@equinusocio]",
@ -20,7 +20,7 @@
"url": "https://github.com/equinusocio/vsc-material-theme/issues" "url": "https://github.com/equinusocio/vsc-material-theme/issues"
}, },
"engines": { "engines": {
"vscode": "^1.28.0" "vscode": "^1.31.0"
}, },
"scripts": { "scripts": {
"build": "yarn cleanup && yarn build-ts && yarn build-themes && yarn build-ui", "build": "yarn cleanup && yarn build-ts && yarn build-themes && yarn build-ui",

View file

@ -28,6 +28,7 @@ export async function activate(context: ExtensionContext) {
// Registering commands // Registering commands
Commands.registerCommand('materialTheme.setAccent', async () => { Commands.registerCommand('materialTheme.setAccent', async () => {
const accentPicked = await ThemeCommands.accentsQuickPick(); const accentPicked = await ThemeCommands.accentsQuickPick();
await ThemeCommands.accentsSetter(accentPicked);
await updateAccent(accentPicked); await updateAccent(accentPicked);
}); });

View file

@ -94,7 +94,6 @@
"keyword.control", "keyword.control",
"constant.other.color", "constant.other.color",
"punctuation", "punctuation",
"meta.tag",
"punctuation.definition.tag", "punctuation.definition.tag",
"punctuation.separator.inheritance.php", "punctuation.separator.inheritance.php",
"punctuation.definition.tag.html", "punctuation.definition.tag.html",
@ -839,6 +838,9 @@
"settings.headerForeground": "{{commons.accents.Teal}}", "settings.headerForeground": "{{commons.accents.Teal}}",
"settings.modifiedItemIndicator": "{{commons.accents.Teal}}", "settings.modifiedItemIndicator": "{{commons.accents.Teal}}",
"settings.checkboxBackground": "{{variant.scheme.backgroundAlt}}", "settings.checkboxBackground": "{{variant.scheme.backgroundAlt}}",
"settings.checkboxForeground": "{{variant.scheme.foreground}}" "settings.checkboxForeground": "{{variant.scheme.foreground}}",
"listFilterWidget.background": "{{variant.scheme.inactiveSelectionBackground}}",
"listFilterWidget.outline": "{{variant.scheme.inactiveSelectionBackground}}",
"listFilterWidget.noMatchesOutline": "{{variant.scheme.inactiveSelectionBackground}}"
} }
} }

1285
yarn.lock

File diff suppressed because it is too large Load diff