Merge branch '6.1' into 6

symbiote · Jun 20, 2024 · f2a5ffe · f2a5ffe
2 parents a29bc37 + aa29eb1
commit f2a5ffe
Show file tree

Hide file tree

Showing 5 changed files with 463 additions and 26 deletions.
diff --git a/.stylelintrc.js b/.stylelintrc.js
@@ -0,0 +1 @@
+module.exports = require('@silverstripe/eslint-config/.stylelintrc');
diff --git a/client/dist/styles/multivaluefield.css b/client/dist/styles/multivaluefield.css
diff --git a/client/src/styles/multivaluefield.scss b/client/src/styles/multivaluefield.scss
@@ -1,6 +1,6 @@
 ul.multivaluefieldlist {
-  margin: 0px;
-  padding: 0px;
+  margin: 0;
+  padding: 0;
 }
 
 .multivaluefieldlist > li {
@@ -9,7 +9,7 @@ ul.multivaluefieldlist {
   list-style-type: none;
 }
 
-.multivaluefieldlist > li::after {
+.multivaluefieldlist > li:after {
   content: '↕';
   cursor: pointer;
 }

diff --git a/package.json b/package.json
@@ -7,11 +7,11 @@
     "build": "yarn && yarn lint && rm -rf client/dist/* && NODE_ENV=production webpack --mode production --bail --progress",
     "dev": "NODE_ENV=development webpack --progress",
     "watch": "NODE_ENV=development webpack --watch --progress",
-    "lint": "eslint client/src && sass-lint client/src"
+    "lint": "eslint client/src && stylelint client/src"
   },
   "dependencies": {},
   "devDependencies": {
-    "@silverstripe/eslint-config": "^1.1.0",
+    "@silverstripe/eslint-config": "^1.3.0",
     "@silverstripe/webpack-config": "^2.0.0",
     "webpack": "^5.74.0",
     "webpack-cli": "^5.0.0"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		module.exports = require('@silverstripe/eslint-config/.stylelintrc');