Merge branch '5.2' into 5

# 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/styles/bundle.scss

@@ -3,7 +3,6 @@
 // Import variables
 @import "variables"; // from silverstripe/admin
 @import "login-forms-variables";
-
 @import "typography";
 @import "layout";
 @import "brand";

client/src/styles/dark-mode.scss

@@ -7,12 +7,10 @@
     --color-button-primary-hover-background: #{$dark-color-button-primary-hover-background};
     --color-button-primary-text: #{$dark-color-button-primary-text};
     --color-button-primary-hover-text: #{$dark-color-button-primary-hover-text};
-
     --color-button-secondary-background: transparent;
     --color-button-secondary-hover-background: #{$dark-color-button-secondary-hover-background};
     --color-button-secondary-text: #{$dark-color-button-secondary-text};
     --color-button-secondary-hover-text: #{$dark-color-button-secondary-hover-text};
-
     --color-field-background: #{$dark-color-field-background};
     --color-field-border: #{$dark-color-field-border};
     --color-field-text: #{$dark-color-field-text};
@@ -31,6 +29,7 @@
   &__logo--dark-mode {
     display: none;
   }
+
   @media (prefers-color-scheme: dark) {
     &__logo--light-mode {
       display: none;

client/src/styles/login-form.scss

@@ -14,7 +14,7 @@ html {
   padding: var(--spacing-form);
   width: 100vw;
 
-  @media (min-width: 420px) {
+  @media (width >= 420px) {
     border-radius: var(--border-radius-form);
     padding: var(--spacing-form-desktop);
     width: auto;
@@ -143,7 +143,7 @@ input[type="submit"] {
     }
   }
 
-  &:not(:disabled):not(.disabled) {
+  &:not(:disabled, .disabled) {
     &:hover,
     &:focus,
     &.focus,
@@ -178,7 +178,7 @@ input[type="submit"] {
     }
   }
 
-  &:not(:disabled):not(.disabled) {
+  &:not(:disabled, .disabled) {
     &:hover,
     &:focus,
     &.focus,
@@ -213,14 +213,15 @@ input[type="checkbox"] {
 
   // Style the notch on the popup bottle for each possible position
   $positions: top, bottom, left, right;
+
   @each $pos in $positions {
     &.bs-popover-auto[x-placement^="#{$pos}"],
     &.bs-popover-#{$pos} {
-      & > .arrow::before {
+      > .arrow:before {
         border-#{$pos}-color: var(--color-field-border);
       }
 
-      & > .arrow::after {
+      > .arrow:after {
         border-#{$pos}-color: var(--color-form-background);
       }
     }

client/src/styles/login-forms-variables.scss

@@ -54,12 +54,10 @@ $spacing-submit-content: 10px 20px;
   --color-button-secondary-hover-background: #{$color-button-secondary-hover-background};
   --color-button-secondary-text: #{$link-color};
   --color-button-secondary-hover-text: #{$link-color};
-
   --color-button-primary-background: #{$color-button-primary-background};
   --color-button-primary-hover-background: #{$color-button-primary-hover-background};
   --color-button-primary-text: #{$color-button-primary-text};
   --color-button-primary-hover-text: #{$color-button-primary-hover-text};
-
   --color-field-background: #{$white};
   --color-field-border: #{$gray-200};
   --color-field-text: #{$gray-800};
@@ -70,15 +68,12 @@ $spacing-submit-content: 10px 20px;
   --color-message-warning: #{$color-message-warning};
   --color-page-background: #{$color-page-background};
   --color-page-text: #{$gray-800};
-
   --border-radius-form: #{$border-radius-form};
   --border-radius-field: #{$border-radius-field};
   --box-shadow-form: #{$box-shadow-form};
-
   --sizing-app-brand-max-height: #{$sizing-app-brand-max-height};
   --sizing-app-brand-max-width: #{$sizing-app-brand-max-width};
   --sizing-content-width: #{$sizing-content-width};
-
   --spacing-app-brand: #{$spacing-app-brand};
   --spacing-field-content: #{$spacing-field-content};
   --spacing-form: #{$spacing-form};

package.json

@@ -10,7 +10,7 @@
     "dev": "NODE_ENV=development webpack --progress",
     "watch": "yarn && NODE_ENV=development webpack --watch --progress",
     "css": "WEBPACK_CHILD=css npm run build",
-    "lint": "stylelint client/src/**/*.scss"
+    "lint": "stylelint client/src"
   },
   "repository": {
     "type": "git",
@@ -31,7 +31,7 @@
     "@babel/core": "^7.20.5",
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-react": "^7.18.6",
-    "@silverstripe/eslint-config": "^1.2.1",
+    "@silverstripe/eslint-config": "^1.3.0",
     "@silverstripe/webpack-config": "^2.1.0",
     "babel-loader": "^9.1.0",
     "css-loader": "^6.7.2",

src/EnablerExtension.php

@@ -61,10 +61,10 @@ public function beforeCallActionHandler()
         $config = Config::inst();
         $action = $this->getOwner()->getAction();
         $allowedActions = $config->get(Security::class, 'allowed_actions');
-        $excludedActions = $config->get(self::class, 'excluded_actions');
+        $excludedActions = $config->get(EnablerExtension::class, 'excluded_actions');
         $themeActions = array_diff($allowedActions ?? [], $excludedActions);
         if (in_array($action, $themeActions ?? [])) {
-            SSViewer::set_themes($config->get(self::class, 'login_themes'));
+            SSViewer::set_themes($config->get(EnablerExtension::class, 'login_themes'));
         }
         $this->defaultPageClass = $config->get(Security::class, 'page_class');
         Config::modify()->remove(Security::class, 'page_class');