From f1bdbf63b05856470fb92bfdeddffc1951b081f5 Mon Sep 17 00:00:00 2001
From: Soumyajit Chakraborty <51930458+Isoumyajit@users.noreply.github.com>
Date: Mon, 14 Jul 2025 13:33:47 +0530
Subject: [PATCH] AAE-36368 Fixing labels and form-fields on content-ee and apa
 (#10982)

* AAE-36368 fixing labels and form-fields on content-ee and apa

* AAE-36368 removing padding for ACA

* AAE-36368 fixing the PR for ACA issues

* AAE-36368 resolving PR comments removing adf-form-field-input class
---
 .../card-view-selectitem.component.html                  | 2 +-
 .../card-view-selectitem.component.scss                  | 8 ++++++--
 .../card-view-textitem/card-view-textitem.component.html | 5 +++--
 .../card-view-textitem/card-view-textitem.component.scss | 7 ++-----
 .../components/card-view/card-view.component.scss        | 9 ++++-----
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.html b/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.html
index 617952bf48..1a416d2731 100644
--- a/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.html
+++ b/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.html
@@ -46,7 +46,7 @@
         </div>
         <div *ngSwitchCase="'autocompleteBased'">
             <mat-form-field
-                class="adf-property-field adf-card-selectitem-autocomplete"
+                class="adf-property-field adf-card-selectitem-autocomplete  "
                 [ngClass]="{ 'adf-property-read-only': !isEditable }"
                 [floatLabel]="property.default ? 'always' : null"
             >
diff --git a/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.scss b/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.scss
index e433dc7ec0..548ff18a31 100644
--- a/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.scss
+++ b/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.scss
@@ -14,7 +14,7 @@
         z-index: 1;
     }
 
-    .adf-property-value-editable.adf-property-value-editable {
+    .adf-property-value-editable {
         padding-left: 0;
 
         #{ms.$mat-text-field-no-label} #{ms.$mat-form-field-infix} {
@@ -55,7 +55,6 @@
         cursor: default;
         padding: 6px 0;
         border-bottom: 1px solid var(--adf-metadata-property-panel-border-color);
-        color: var(--adf-metadata-property-panel-title-color);
     }
 
     #{ms.$mat-line-ripple} {
@@ -72,4 +71,9 @@
             font-size: 10px;
         }
     }
+
+    #{ms.$mat-form-field-infix} {
+        padding-left: 3%;
+        padding-right: 3%;
+    }
 }
diff --git a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.html b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.html
index e4a2f3b827..60dd416349 100644
--- a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.html
+++ b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.html
@@ -25,7 +25,8 @@
                 [ngClass]="{
                     'adf-property-value-editable': editable,
                     'adf-property-readonly-value': isReadonlyProperty,
-                    'adf-property-value-has-error': isEditable && hasErrors
+                    'adf-property-value-has-error': isEditable && hasErrors,
+                    'adf-property-value-not-editable': !editable
                 }"
                 title="{{ property.label | translate }}"
                 [placeholder]="property.default"
@@ -110,7 +111,7 @@
         (keyup.enter)="clicked()"
         (click)="clicked()"
     >
-        <mat-form-field class="adf-property-field adf-card-textitem-field" [floatLabel]="property.default ? 'always' : null">
+        <mat-form-field class="adf-property-field adf-card-textitem-field   " [floatLabel]="property.default ? 'always' : null">
             <mat-label
                 *ngIf="showProperty || isEditable"
                 [attr.data-automation-id]="'card-textitem-label-' + property.key"
diff --git a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.scss b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.scss
index 2e2f3838eb..87637daf1b 100644
--- a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.scss
+++ b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.scss
@@ -71,11 +71,8 @@
         border-bottom: 1px solid var(--adf-metadata-property-panel-border-color);
     }
 
-    .adf-property-readonly-value:disabled {
-        color: var(--adf-metadata-property-panel-title-color);
-    }
-
-    .adf-property-value-editable:not(:disabled) {
+    .adf-property-value-not-editable {
+        /* stylelint-disable-next-line declaration-no-important */
         color: var(--adf-metadata-property-panel-title-color);
     }
 
diff --git a/lib/core/src/lib/card-view/components/card-view/card-view.component.scss b/lib/core/src/lib/card-view/components/card-view/card-view.component.scss
index 6fc23f935d..d3a14586cd 100644
--- a/lib/core/src/lib/card-view/components/card-view/card-view.component.scss
+++ b/lib/core/src/lib/card-view/components/card-view/card-view.component.scss
@@ -9,6 +9,10 @@
         color: var(--adf-metadata-property-panel-text-color);
         display: flex;
         line-height: 20px;
+     
+        &.adf-property-readonly-value {
+            color: var(--adf-metadata-property-panel-label-color);
+        }
 
         &.adf-property-value-editable {
             color: var(--adf-metadata-property-panel-title-color);
@@ -29,8 +33,6 @@
 
             #{ms.$mat-input-element} {
                 text-overflow: ellipsis;
-                color: var(--adf-metadata-property-panel-title-color);
-                padding: 6px 0;
                 line-height: 20px;
 
                 &.adf-property-value-editable {
@@ -85,10 +87,7 @@
     }
 
     .adf-property-value {
-        color: var(--adf-metadata-property-panel-title-color);
-
         &.adf-property-value-editable {
-            color: var(--adf-metadata-property-panel-title-color);
             background-color: var(--adf-metadata-buttons-background-color);
             box-sizing: border-box;
             border-radius: 6px;