Merge branch '5.2' into 5

client/src/styles/bundle.scss

@@ -4,8 +4,5 @@
 // Note: By prefixing files with an underscore, they won't create individual CSS files.
 
 @import "variables";
-
 @import "legacy/CMSMain";
-@import "legacy/ReportAdmin";
-
 @import "../components/AnchorSelectorField/AnchorSelectorField";

client/src/styles/legacy/_CMSMain.scss

@@ -49,14 +49,14 @@
 .cms-content-tools {
 	#cms-content-treeview {
 		.cms-content-toolbar {
-			border-bottom: none;
+			border-bottom: 0;
 			box-shadow: none;
 			margin-bottom: 0;
 		}
 		.cms-tree-expand-trigger {
 			display: block;
 			float: left;
-			margin: 0 0 2px 0;
+			margin: 0 0 2px;
 			span.ui-button-text {
 					padding-right: 8px;
 			}
@@ -135,7 +135,7 @@
   }
 
 	&.loading .form__field-label {
-		background-image: url(../../images/loading.gif);
+		background-image: url("../../images/loading.gif");
     background-repeat: no-repeat;
     background-position: right center;
     padding-right: 20px;
@@ -179,6 +179,6 @@
 
 .form__field-update-url {
     border-radius: 0 3px 3px 0;
-    margin-right: 0px;
+    margin-right: 0;
     margin-left: -1px;
 }

client/src/styles/legacy/_SilverStripeNavigator.scss

@@ -9,7 +9,7 @@
 }
 
 #SilverStripeNavigator * {
-	font-family: Arial,Helvetica,sans-serif;
+	font-family: "Arial","Helvetica",sans-serif;
 	font-size: 10px !important;
 }
 
@@ -18,12 +18,14 @@
 	padding-top : 4px;
 	padding-left : 3px;
 	padding-right : 6px;
-	color: white;
-	border-top: 1px solid #555555;
+	color: #fff;
+	border-top: 1px solid #555;
 }
+
 #SilverStripeNavigator #logInStatus {
 	float: right;
 }
+
 #SilverStripeNavigator #switchView {
 	float: left;
 
@@ -34,6 +36,7 @@
 	background-color: transparent;
 	text-decoration: underline;
 }
+
 #SilverStripeNavigator a:hover  {
 	background-color: transparent;
 }
@@ -49,15 +52,13 @@
 }
 
 #SilverStripeNavigatorMessage {
-	font-family: 'Lucida Grande', Verdana, Arial, 'sans-serif';
+	font-family: 'Lucida Grande', 'Verdana', 'Arial', sans-serif;
 	position: fixed;
 	z-index: 1000;
 	right: 20px;
 	top: 40px;
 	padding: 10px;
-	border-color: #c99;
 	color: #fff;
-	background-color: #c00;
 	border: 1px solid #000;
 }
 
@@ -68,10 +69,10 @@
 	height: 50px;
 	width: 350px;
 	left: 200px;
-	background-color: white;
-	border: 1px solid black;
+	background-color: #fff;
+	border: 1px solid #000;
 	z-index: 100;
-	color: black;
+	color: #000;
 	padding: 5px;
 }
 
@@ -80,9 +81,9 @@
 }
 
 #SilverStripeNavigatorLinkPopup a.close {
-	color: blue;
+	color: #00f;
 	text-align: right;
 	width: 80%;
-	border: none !important;
+	border: 0 !important;
 	cursor: pointer;
 }

package.json

@@ -15,7 +15,7 @@
     "css": "WEBPACK_CHILD=css npm run build",
     "test": "jest",
     "coverage": "jest --coverage",
-    "lint": "eslint client/src && stylelint client/src/**/*.scss"
+    "lint": "eslint client/src && stylelint client/src"
   },
   "repository": {
     "type": "git",
@@ -52,7 +52,7 @@
     "redux-form": "^8.3.8"
   },
   "devDependencies": {
-    "@silverstripe/eslint-config": "^1.2.1",
+    "@silverstripe/eslint-config": "^1.3.0",
     "@silverstripe/webpack-config": "^2.1.0",
     "@testing-library/react": "^14.0.0",
     "babel-jest": "^29.3.0",