Merge branch '3.2' into 3

# Conflicts:
#	yarn.lock

.github/workflows/add-prs-to-project.yml

@@ -0,0 +1,22 @@
+name: Add new PRs to github project
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - ready_for_review
+
+permissions: {}
+
+jobs:
+  addprtoproject:
+    name: Add PR to GitHub Project
+    # Only run on the silverstripe account
+    if: github.repository_owner == 'silverstripe'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add PR to github project
+        uses: silverstripe/gha-add-pr-to-project@v1
+        with:
+          app_id: ${{ vars.PROJECT_PERMISSIONS_APP_ID }}
+          private_key: ${{ secrets.PROJECT_PERMISSIONS_APP_PRIVATE_KEY }}

client/src/components/ShareDraftContent/ShareDraftContent.scss

@@ -14,7 +14,7 @@
 }
 
 // Add the external link icon after the "learn more" link
-.share-draft-content__learn-more::after {
+.share-draft-content__learn-more:after {
   font-family: 'silverstripe';
   // font-icon-external-link
   content: '@';

client/src/styles/bundle-cms.scss

@@ -1,4 +1,3 @@
 // Core variables
 @import "variables";
-
 @import "../components/ShareDraftContent/ShareDraftContent";

client/src/styles/error-page.scss

@@ -1,4 +1,4 @@
-@import 'mixins.scss';
+@import 'mixins';
 
 html {
 	height: 100%;
@@ -8,7 +8,7 @@ html {
 	position: relative;
 	height: 100%;
 	margin: 0;
-	font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+	font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", "Lucida Grande", sans-serif;
 	font-weight: 300;
 	background: #eaf1f4;
 

client/src/styles/mixins.scss

@@ -1,23 +1,23 @@
 @mixin mobile-screen {
-	@media (max-width: 768px) and (max-height: 540px) {
+	@media (width <= 768px) and (height <= 540px) {
 		@content;
 	}
 }
 
 @mixin small-screen {
-	@media (max-width: 768px) {
+	@media (width <= 768px) {
 		@content;
 	}
 }
 
 @mixin large-screen {
-	@media (min-width: 1441px) {
+	@media (width >= 1441px) {
 		@content;
 	}
 }
 
 @mixin topbar-small {
-	@media (max-width: 582px) {
+	@media (width <= 582px) {
 		@content;
 	}
 }

client/src/styles/top-bar.scss

@@ -1,4 +1,4 @@
-@import 'mixins.scss';
+@import 'mixins';
 
 body {
 	margin-top: 39px !important;
@@ -68,7 +68,7 @@ body {
 		text-align: center;
 		margin-top: 0;
 		margin-bottom: 0;
-		font-family: Arial, Helvetica, sans-serif;
+		font-family: "Arial", "Helvetica", sans-serif;
 		font-size: 13px;
 		line-height: 16px;
 		color: rgb(51, 51, 51);

package.json

@@ -19,10 +19,10 @@
     "dev": "NODE_ENV=development webpack --progress",
     "watch": "NODE_ENV=development webpack --watch --progress",
     "css": "WEBPACK_CHILD=css npm run build",
-    "lint": "eslint client/src && yarn lint-sass",
+    "lint": "yarn lint-js && yarn lint-sass",
     "lint-js": "eslint client/src",
     "lint-js-fix": "eslint client/src --fix",
-    "lint-sass": "stylelint **/client/src/**/*.scss",
+    "lint-sass": "stylelint client/src",
     "test": "echo 1 > /dev/null"
   },
   "dependencies": {
@@ -33,7 +33,7 @@
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@silverstripe/eslint-config": "^1.2.1",
+    "@silverstripe/eslint-config": "^1.3.0",
     "@silverstripe/webpack-config": "^2.1.0",
     "webpack": "^5.74.0",
     "webpack-cli": "^5.0.0"

tests/behat/src/FeatureContext.php

@@ -13,7 +13,7 @@ class FeatureContext extends SilverStripeContext
      */
     public function iSaveTheLinkToShareDraftContentLocalStorage()
     {
-        $key = self::KEY;
+        $key = FeatureContext::KEY;
         $js = <<<JS
             window.localStorage.setItem('{$key}', document.querySelector('.share-draft-content__link').value);
 JS;
@@ -25,7 +25,7 @@ public function iSaveTheLinkToShareDraftContentLocalStorage()
      */
     public function iFollowTheLinkInShareDraftContentLocalStorage()
     {
-        $key = self::KEY;
+        $key = FeatureContext::KEY;
         $js = <<<JS
             window.location = window.localStorage.getItem('{$key}');
 JS;
@@ -37,7 +37,7 @@ public function iFollowTheLinkInShareDraftContentLocalStorage()
      */
     public function iClearTheLinkFromShareDraftContentLocalStorage()
     {
-        $key = self::KEY;
+        $key = FeatureContext::KEY;
         $js = <<<JS
             window.localStorage.removeItem('{$key}');
 JS;