From 4c7d5c440fa15dfae4fd11c6705fb834909980f6 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 21 Oct 2021 16:53:16 +0200
Subject: Align .editorconfig with .stylelintrc for CSS files (#3912)

And add explicit file extension to `.stylelintrc`
---
 .editorconfig     |  3 +++
 .stylelintrc      | 72 -------------------------------------------------------
 .stylelintrc.json | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 72 deletions(-)
 delete mode 100644 .stylelintrc
 create mode 100644 .stylelintrc.json

diff --git a/.editorconfig b/.editorconfig
index 7e376db74..7a025cfcd 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,6 +8,9 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.{css,scss}]
+indent_style = tab
+
 [*.{html,php,phtml}]
 indent_size = 4
 indent_style = tab
diff --git a/.stylelintrc b/.stylelintrc
deleted file mode 100644
index b14138d3a..000000000
--- a/.stylelintrc
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "extends": "stylelint-config-recommended-scss",
-  "plugins": [
-    "stylelint-order",
-    "stylelint-scss"
-  ],
-  "rules": {
-    "at-rule-empty-line-before": [
-      "always", {
-        "ignoreAtRules": [ "after-comment", "else" ]
-      }
-    ],
-    "at-rule-name-space-after": [
-      "always", {
-        "ignoreAtRules": [ "after-comment" ]
-      }
-    ],
-    "block-closing-brace-newline-after": [
-      "always", {
-        "ignoreAtRules": [ "if", "else" ]
-      }
-    ],
-    "block-closing-brace-newline-before": "always-multi-line",
-    "block-opening-brace-newline-after": "always-multi-line",
-    "block-opening-brace-space-before": "always",
-    "color-hex-case": "lower",
-    "color-hex-length": "short",
-    "color-no-invalid-hex": true,
-    "declaration-colon-space-after": "always",
-    "declaration-colon-space-before": "never",
-    "indentation": "tab",
-    "no-descending-specificity": null,
-    "no-eol-whitespace": true,
-    "property-no-vendor-prefix": true,
-    "rule-empty-line-before": [
-      "always", {
-        "except": ["after-single-line-comment","first-nested"]
-      }
-    ],
-    "order/properties-order": [
-      "margin",
-      "padding",
-      "background",
-      "display",
-      "float",
-      "max-width",
-      "width",
-      "max-height",
-      "height",
-      "color",
-      "font",
-      "font-family",
-      "font-size",
-      "border",
-      "border-top",
-      "border-top-color",
-      "border-right",
-      "border-right-color",
-      "border-bottom",
-      "border-bottom-color",
-      "border-left",
-      "border-left-color",
-      "border-radius",
-      "box-shadow"
-    ],
-    "scss/at-else-closing-brace-newline-after": "always-last-in-chain",
-    "scss/at-else-closing-brace-space-after": "always-intermediate",
-    "scss/at-else-empty-line-before": "never",
-    "scss/at-if-closing-brace-newline-after": "always-last-in-chain",
-    "scss/at-if-closing-brace-space-after": "always-intermediate"
-  }
-}
diff --git a/.stylelintrc.json b/.stylelintrc.json
new file mode 100644
index 000000000..b14138d3a
--- /dev/null
+++ b/.stylelintrc.json
@@ -0,0 +1,72 @@
+{
+  "extends": "stylelint-config-recommended-scss",
+  "plugins": [
+    "stylelint-order",
+    "stylelint-scss"
+  ],
+  "rules": {
+    "at-rule-empty-line-before": [
+      "always", {
+        "ignoreAtRules": [ "after-comment", "else" ]
+      }
+    ],
+    "at-rule-name-space-after": [
+      "always", {
+        "ignoreAtRules": [ "after-comment" ]
+      }
+    ],
+    "block-closing-brace-newline-after": [
+      "always", {
+        "ignoreAtRules": [ "if", "else" ]
+      }
+    ],
+    "block-closing-brace-newline-before": "always-multi-line",
+    "block-opening-brace-newline-after": "always-multi-line",
+    "block-opening-brace-space-before": "always",
+    "color-hex-case": "lower",
+    "color-hex-length": "short",
+    "color-no-invalid-hex": true,
+    "declaration-colon-space-after": "always",
+    "declaration-colon-space-before": "never",
+    "indentation": "tab",
+    "no-descending-specificity": null,
+    "no-eol-whitespace": true,
+    "property-no-vendor-prefix": true,
+    "rule-empty-line-before": [
+      "always", {
+        "except": ["after-single-line-comment","first-nested"]
+      }
+    ],
+    "order/properties-order": [
+      "margin",
+      "padding",
+      "background",
+      "display",
+      "float",
+      "max-width",
+      "width",
+      "max-height",
+      "height",
+      "color",
+      "font",
+      "font-family",
+      "font-size",
+      "border",
+      "border-top",
+      "border-top-color",
+      "border-right",
+      "border-right-color",
+      "border-bottom",
+      "border-bottom-color",
+      "border-left",
+      "border-left-color",
+      "border-radius",
+      "box-shadow"
+    ],
+    "scss/at-else-closing-brace-newline-after": "always-last-in-chain",
+    "scss/at-else-closing-brace-space-after": "always-intermediate",
+    "scss/at-else-empty-line-before": "never",
+    "scss/at-if-closing-brace-newline-after": "always-last-in-chain",
+    "scss/at-if-closing-brace-space-after": "always-intermediate"
+  }
+}
-- 
cgit v1.2.3