From 4b3a90761d24bdedfd9da27cece43c6e4130ddb7 Mon Sep 17 00:00:00 2001
From: Tomasz Nastaly <tomasz.nastaly@hyland.com>
Date: Thu, 24 Jul 2025 12:25:17 +0200
Subject: [PATCH] AAE-36582 Fix forms misaligment in adf form renderer

---
 .../src/lib/form/components/form-renderer.component.html  | 2 +-
 .../src/lib/form/components/form-renderer.component.scss  | 8 ++++++++
 .../components/form-section/form-section.component.scss   | 1 -
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/core/src/lib/form/components/form-renderer.component.html b/lib/core/src/lib/form/components/form-renderer.component.html
index a553248e34..cd1e7e6182 100644
--- a/lib/core/src/lib/form/components/form-renderer.component.html
+++ b/lib/core/src/lib/form/components/form-renderer.component.html
@@ -1,4 +1,4 @@
-<div id="adf-form-renderer" class="{{ formDefinition.className }}"
+<div id="adf-form-renderer" class="{{ formDefinition.className }} adf-form-renderer"
      [ngClass]="{ 'adf-readonly-form': formDefinition.readOnly }">
     <div *ngIf="formDefinition.hasTabs()">
         <div *ngIf="hasTabs()" class="alfresco-tabs-widget">
diff --git a/lib/core/src/lib/form/components/form-renderer.component.scss b/lib/core/src/lib/form/components/form-renderer.component.scss
index 4933128c78..0a9b5d034d 100644
--- a/lib/core/src/lib/form/components/form-renderer.component.scss
+++ b/lib/core/src/lib/form/components/form-renderer.component.scss
@@ -13,6 +13,14 @@
     height: 100%;
 }
 
+.adf-form-renderer {
+    // override Material styles, otherwise fields collapse on some screen widths
+    .mat-mdc-form-field-infix {
+        /* stylelint-disable-next-line declaration-no-important */
+        width: auto !important;
+    }
+}
+
 .alfresco-tabs-widget {
     width: 100%;
 
diff --git a/lib/core/src/lib/form/components/form-section/form-section.component.scss b/lib/core/src/lib/form/components/form-section/form-section.component.scss
index 59b2562c35..ef92937364 100644
--- a/lib/core/src/lib/form/components/form-section/form-section.component.scss
+++ b/lib/core/src/lib/form/components/form-section/form-section.component.scss
@@ -3,7 +3,6 @@
         &-single-column {
             display: flex;
             flex-wrap: inherit;
-            align-items: baseline;
             gap: 1%;
         }