Merge remote-tracking branch 'upstream/3.x' into 3.x

moonshine-software · Feb 8, 2025 · 890b2a3 · 890b2a3
2 parents 053c975 + a448fca
commit 890b2a3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/UI/dist/assets/main.css b/src/UI/dist/assets/main.css
diff --git a/src/UI/resources/css/components/forms.css b/src/UI/resources/css/components/forms.css
@@ -101,7 +101,7 @@ input[type='number'] {
 
 /* Form Error */
 .form-error {
-  @apply !mt-0 text-3xs text-red-600 dark:text-red-500;
+  @apply col-span-12 !mt-0 text-3xs text-red-600 dark:text-red-500;
 }
 
 /* Form Switcher */

diff --git a/src/UI/src/Fields/Json.php b/src/UI/src/Fields/Json.php
@@ -445,7 +445,7 @@ public function getComponent(): ComponentContract
                         ? Column::make()->columnSpan($this->verticalValueSpan)
                         /** @var Column $default */
                         /** @phpstan-ignore-next-line  */
-                        : $default->columnSpan($this->verticalValueSpan) : null,
+                        : $default->columnSpan($this->verticalValueSpan)->customAttributes(['data-validation-wrapper' => true]) : null,
                 ),
             )
             ->when(