diff options
| author | Sam Potts <sam@potts.es> | 2020-03-30 10:45:57 +1100 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2020-03-30 10:45:57 +1100 |
| commit | da943b384ca334cad66fd261cb9a0f924716da9d (patch) | |
| tree | 5aaac37b474a2708c7910eb536b9d96d4c0dcff3 /plyr.code-workspace | |
| parent | 50a7c2fad6f0d9b03788fe57a855894eafcf5ef7 (diff) | |
| parent | ad63af5096e014785bd22eac24bc8030c0dc70d6 (diff) | |
| download | plyr-da943b384ca334cad66fd261cb9a0f924716da9d.tar.lz plyr-da943b384ca334cad66fd261cb9a0f924716da9d.tar.xz plyr-da943b384ca334cad66fd261cb9a0f924716da9d.zip | |
Merge branch 'develop' into css-variables
# Conflicts:
# demo/dist/demo.css
# demo/dist/demo.min.js.map
# demo/index.html
# dist/plyr.css
# dist/plyr.min.js.map
# dist/plyr.min.mjs.map
# dist/plyr.polyfilled.min.js.map
# dist/plyr.polyfilled.min.mjs.map
# gulpfile.js
# src/sass/base.scss
# src/sass/components/control.scss
# src/sass/settings/colors.scss
# src/sass/settings/controls.scss
Diffstat (limited to 'plyr.code-workspace')
| -rw-r--r-- | plyr.code-workspace | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/plyr.code-workspace b/plyr.code-workspace index 06dabaac..bcd26028 100644 --- a/plyr.code-workspace +++ b/plyr.code-workspace @@ -9,22 +9,29 @@ "**/node_modules": true, "**/dist": true }, + // Linting "stylelint.enable": true, "css.validate": false, "scss.validate": false, "javascript.validate.enable": false, - // Prettier - "prettier.eslintIntegration": true, - "prettier.stylelintIntegration": true, - // Formatting + "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.tabSize": 4, "editor.insertSpaces": true, "editor.formatOnSave": true, // Trim on save - "files.trimTrailingWhitespace": true + "files.trimTrailingWhitespace": true, + + // Special file associations + "files.associations": { + ".eslintrc": "jsonc" + }, + + "editor.codeActionsOnSave": { + "source.fixAll": true + } } } |