Merge branch 'main' of github.com:TYPO3incubator/surfcamp-team6

TYPO3incubator · Apr 11, 2024 · 3332ef3 · 3332ef3
2 parents 7270f00 + 8207a30
commit 3332ef3
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 11 deletions.
diff --git a/assets/scss/base/_global.scss b/assets/scss/base/_global.scss
@@ -34,11 +34,17 @@ html {
         @apply bg-black text-white hover:bg-gray-900 focus:bg-gray-900;
     }
 
+    button[type="submit"] {
+        @extend .btn;
+        @extend .btn-primary;
+    }
+
+
     .heading-xxl {
         @apply text-5xl font-bold font-heading block;
     }
 
-    .heading-xl {
+    .heading-xl, form h2 {
         @apply text-3xl font-bold font-heading block;
     }
 
@@ -52,6 +58,7 @@ html {
     h4,
     h5,
     span {
+        @apply mb-1;
         &.default {
             @apply text-lg font-bold font-heading block;
         }
@@ -89,22 +96,56 @@ html {
                 @apply flex flex-col gap-2;
             }
             & .hamburger-menu-button {
-                @apply absolute top-3 right-2 z-50
+                @apply absolute top-3 right-2 z-50;
             }
         }
         & ul {
             @apply hidden lg:flex;
         }
     }
 
-    .form-control {
-        @apply bg-white shadow appearance-none rounded w-full py-2 px-3 text-black leading-tight focus:outline-none focus:ring-2
+    .form {
+        &-label {
+            @apply inline-block mb-1;
+        }
+        &-text {
+            @apply block mt-1;
+        }
+        &-control {
+            @apply bg-white shadow appearance-none rounded w-full py-2 px-3 text-black leading-tight focus:outline-none focus:ring-2 resize-none;
+        }
+        &-check {
+            &-label {
+                @apply flex items-center gap-2;
+            }
+        }
+        &-checkbox {
+            @apply rounded h-5 w-5 accent-secondary-500;
+        }
+        &-radio {
+            @apply h-5 w-5 accent-secondary-500;
+        }
+        &-group {
+            @apply mb-4 last:mb-0;
+        }
+    }
+
+    input {
+        &[type="checkbox"] {
+            @extend .form-checkbox;
+        }
     }
 
-    .form-checkbox {
-        @apply rounded h-5 w-5 accent-secondary-500;
+    [type="file"] {
+        @apply text-primarytext;
     }
-    .form-radio {
-        @apply h-5 w-5 accent-secondary-500;
+    [type="file"]::-webkit-file-upload-button {
+        @extend .btn;
+        @extend .btn-primary;
+        @apply border-0;
+    }
+
+    .required {
+        @apply text-error;
     }
 }
diff --git a/..._packages/success/Resources/Private/Templates/_LandingPage/Content/FormFormframework.html b/..._packages/success/Resources/Private/Templates/_LandingPage/Content/FormFormframework.html
@@ -5,6 +5,8 @@
 
 <f:layout name="Default"/>
 <f:section name="Main">
-    <f:cObject typoscriptObjectPath="tt_content.form_formframework.20" data="{rawData}"/>
+    <div class="container px-5 mx-auto py-12">
+        <f:cObject typoscriptObjectPath="tt_content.form_formframework.20" data="{rawData}"/>
+    </div>
 </f:section>
 </html>
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFaq.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFaq.html
@@ -16,7 +16,7 @@
                             class="cursor-pointer transition-all focus:ring-2 focus:ring-primary-200 background-white rounded w-full text-left font-bold px-4 py-2 flex justify-between items-center">
                             {faqItem.question}
                             <span aria-hidden="true"
-                                  class="rounded-full w-5 h-5 flex items-center justify-center background-primary text-sm ml-3">&plus;</span>
+                                  class="shrink-0 rounded-full w-5 h-5 flex items-center justify-center background-primary text-sm ml-3">&plus;</span>
                         </summary>
                         <article class="rte rounded background-white px-4 py-2 border-t border-t-2 border-light-500">
                             <f:format.html>{faqItem.answer}</f:format.html>

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -1,7 +1,7 @@
 
 /** @type {import('tailwindcss').Config} */
 export default {
-  content: ["local_packages/success/**/*.html"],
+  content: ["local_packages/success/**/*.html", "vendor/typo3/**/*.html"],
   theme: {
     fontFamily: {
       text: ['var(--font-text)'],
@@ -37,6 +37,9 @@ export default {
         '500': 'var(--color-light)',
         '700': 'var(--color-light-dark)',
       },
+      error: {
+        DEFAULT: '#f44336'
+      },
       primarytext: 'var(--color-primarytext)',
       secondarytext: 'var(--color-secondarytext)',
       lighttext: 'var(--color-lighttext)',