Merge remote-tracking branch 'origin/main'

TYPO3incubator · Apr 12, 2024 · e5ad282 · e5ad282
2 parents c89f889 + 041b50d
commit e5ad282
Show file tree

Hide file tree

Showing 24 changed files with 553 additions and 53 deletions.
diff --git a/.ddev/config.yaml b/.ddev/config.yaml
@@ -1,7 +1,7 @@
 name: surfcamp-team6
-type: php
+type: typo3
 docroot: public
-php_version: "8.2"
+php_version: "8.3"
 nodejs_version: "20"
 webserver_type: nginx-fpm
 xdebug_enabled: false

diff --git a/assets/scss/base/_global.scss b/assets/scss/base/_global.scss
@@ -36,27 +36,56 @@ html {
 
 @layer components {
     .btn {
-        @apply inline-block py-2 px-5 font-bold rounded transition-colors focus:ring focus:ring-2 focus:ring-primary-200;
+        @apply inline-block py-2 px-5 font-bold rounded transition-colors;
+
+        &:focus {
+            @apply ring ring-2 ring-primary-200;
+        }
     }
 
     .btn-primary {
-        @apply bg-primary-500 text-primarytext hover:bg-primary-700 focus:bg-primary-700;
+        @apply bg-primary-500 text-primarytext;
+
+        &:focus,
+        &:hover {
+            @apply bg-primary-700;
+        }
     }
 
     .btn-secondary {
-        @apply bg-secondary-500 text-secondarytext hover:bg-secondary-700 focus:bg-secondary-700;
+        @apply bg-secondary-500 text-secondarytext;
+
+        &:focus,
+        &:hover {
+            @apply bg-secondary-700;
+        }
     }
 
     .btn-light {
-        @apply bg-light-500 text-lighttext hover:bg-light-700 focus:bg-light-700;
+        @apply bg-light-500 text-lighttext;
+
+        &:focus,
+        &:hover {
+            @apply bg-light-700;
+        }
     }
 
     .btn-white {
-        @apply bg-white-variable text-whitetext hover:bg-gray-100 focus:bg-gray-100;
+        @apply bg-white-variable text-whitetext;
+
+        &:focus,
+        &:hover {
+            @apply bg-gray-100;
+        }
     }
 
     .btn-black {
-        @apply bg-black text-blacktext hover:bg-gray-900 focus:bg-gray-900;
+        @apply bg-black text-blacktext;
+
+        &:focus,
+        &:hover {
+            @apply bg-gray-900;
+        }
     }
 
     button[type="submit"] {
@@ -88,9 +117,35 @@ html {
         }
     }
 
+    .link {
+        @apply underline;
+
+        &:hover,
+        &:focus {
+            @apply no-underline;
+        }
+
+        &:focus {
+            @apply ring ring-2 ring-primary-200
+        }
+    }
+
     .rte {
-        a {
-            @apply underline hover:no-underline focus:no-underline focus:ring focus:ring-2 focus:ring-offset-2 focus:ring-primary-200;
+        a:not(.btn) {
+            @apply underline;
+
+            &:hover,
+            &:focus {
+                @apply no-underline;
+            }
+
+            &:focus {
+                @apply ring ring-2 ring-primary-200
+            }
+        }
+
+        .btn {
+            @apply my-4;
         }
 
         h1 {
@@ -169,7 +224,11 @@ html {
         }
 
         &-control {
-            @apply bg-white-variable shadow appearance-none rounded w-full py-2 px-3 text-whitetext leading-tight focus:outline-none focus:ring-2 resize-none;
+            @apply bg-white-variable shadow appearance-none rounded w-full py-2 px-3 text-whitetext leading-tight resize-none;
+
+            &:focus {
+                @apply outline-none ring ring-2 ring-primary-200
+            }
         }
 
         &-check {
@@ -180,10 +239,18 @@ html {
 
         &-checkbox {
             @apply rounded h-5 w-5 accent-secondary-500;
+
+            &:focus {
+                @apply outline-none ring ring-2 ring-primary-200
+            }
         }
 
         &-radio {
             @apply h-5 w-5 accent-secondary-500;
+
+            &:focus {
+                @apply outline-none ring ring-2 ring-primary-200
+            }
         }
 
         &-group {

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "config": {
         "bin-dir": "bin",
         "platform": {
-            "php": "8.2.0"
+            "php": "8.3.6"
         },
         "sort-packages": true,
         "allow-plugins": {
@@ -36,7 +36,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "b13/backendpreviews": "dev-v13-compat",
         "helhum/dotenv-connector": "^3.1",
         "praetorius/vite-asset-collector": "^1.9",

diff --git a/composer.lock b/composer.lock
diff --git a/config/sites/advent/config.yaml b/config/sites/advent/config.yaml
@@ -18,3 +18,8 @@ rootPageId: 3
 websiteTitle: ''
 dependencies:
   - surfcamp/success-advent
+errorHandling:
+  -
+    errorCode: 404
+    errorHandler: Page
+    errorContentSource: 't3://page?uid=9'
diff --git a/config/sites/career/config.yaml b/config/sites/career/config.yaml
@@ -18,3 +18,8 @@ rootPageId: 4
 websiteTitle: ''
 dependencies:
   - surfcamp/success-career
+errorHandling:
+  -
+    errorCode: 404
+    errorHandler: Page
+    errorContentSource: 't3://page?uid=9'
diff --git a/config/sites/product-launch/config.yaml b/config/sites/product-launch/config.yaml
@@ -16,3 +16,8 @@ rootPageId: 1
 websiteTitle: ''
 dependencies:
   - surfcamp/success-product-launch
+errorHandling:
+  -
+    errorCode: 404
+    errorHandler: Page
+    errorContentSource: 't3://page?uid=9'
diff --git a/config/sites/sets-promotion/config.yaml b/config/sites/sets-promotion/config.yaml
@@ -18,3 +18,8 @@ rootPageId: 5
 websiteTitle: ''
 dependencies:
   - surfcamp/success-sets-promotion
+errorHandling:
+  -
+    errorCode: 404
+    errorHandler: Page
+    errorContentSource: 't3://page?uid=9'
diff --git a/config/sites/whitepaper/config.yaml b/config/sites/whitepaper/config.yaml
@@ -18,3 +18,8 @@ rootPageId: 2
 websiteTitle: ''
 dependencies:
   - surfcamp/success-whitepaper
+errorHandling:
+  -
+    errorCode: 404
+    errorHandler: Page
+    errorContentSource: 't3://page?uid=9'