Merge branch 'hotfix/1.2.3'

studiometa · Nov 14, 2019 · b674a8b · b674a8b
2 parents 5517284 + 9e7403d
commit b674a8b
Show file tree

Hide file tree

Showing 7 changed files with 4,742 additions and 3,480 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['@studiometa/eslint-config/prettier-es6'],
+  extends: ['@studiometa/eslint-config'],
 };
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,4 @@
 *.sublime-workspace
 node_modules/
 npm-debug.log
-package-lock.json
+yarn.lock
diff --git a/index.js b/index.js
@@ -7,6 +7,7 @@ module.exports = {
   ],
   plugins: ['stylelint-high-performance-animation'],
   rules: {
+    indentation: [2, { baseIndentLevel: 1 }],
     'plugin/no-low-performance-animation-properties': [
       true,
       { ignore: 'paint-properties' },