Merge branch 'develop' into css-variables

# Conflicts:
#	demo/dist/demo.css
#	demo/index.html
#	dist/plyr.css
#	gulpfile.js
#	package.json
#	yarn.lock

1 files changed, 32 insertions, 31 deletions

diff --git a/plyr.code-workspace b/plyr.code-workspace
index 467623c9..d26398e9 100644
--- a/plyr.code-workspace
+++ b/plyr.code-workspace
@@ -1,32 +1,33 @@
 {
-	"folders": [
-		{
-			"path": "."
-		}
-	],
-	"settings": {
-		// Exclude from the editor
-		"files.exclude": {
-			"**/node_modules": true
-		},
-		// Exclude from search
-		"search.exclude": {
-			"dist/": true,
-			"demo/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.tabSize": 4,
-		"editor.insertSpaces": true,
-		"editor.formatOnSave": true,
-		// Trim on save
-		"files.trimTrailingWhitespace": true
-	}
-}
\ No newline at end of file
+    "folders": [
+        {
+            "path": "."
+        }
+    ],
+    "settings": {
+        "search.exclude": {
+            "**/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.tabSize": 4,
+        "editor.insertSpaces": true,
+        "editor.formatOnSave": true,
+        "editor.codeActionsOnSave": {
+            "source.organizeImports": true
+        },
+
+        // Trim on save
+        "files.trimTrailingWhitespace": true
+    }
+}