From 30ae797d32a0a057aabeaed182c8c8e373c698ef Mon Sep 17 00:00:00 2001
From: "swapnil.verma" <swapnil.verma@globallogic.com>
Date: Wed, 17 Jul 2024 11:24:15 +0530
Subject: [PATCH 1/2] [ACS-8378] Mat form fields now have white background
 instead of grey

---
 projects/aca-content/src/lib/ui/theme.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/aca-content/src/lib/ui/theme.scss b/projects/aca-content/src/lib/ui/theme.scss
index d27875158f..6cddd26d7e 100644
--- a/projects/aca-content/src/lib/ui/theme.scss
+++ b/projects/aca-content/src/lib/ui/theme.scss
@@ -18,7 +18,7 @@ mat-icon {
   color: var(--theme-secondary-text);
 }
 
-#{$mat-text-field-filled}:not(#{$mat-text-field-disabled}) {
+#{$mat-form-field} #{$mat-text-field-filled}:not(#{$mat-text-field-disabled}) {
   background-color: transparent;
   padding: 0;
 }

From e4c37fc9028408be054e32fa75ee9ff948857086 Mon Sep 17 00:00:00 2001
From: "swapnil.verma" <swapnil.verma@globallogic.com>
Date: Wed, 17 Jul 2024 12:18:24 +0530
Subject: [PATCH 2/2] [ACS-8378] Fixed issue where the background of the
 boolean mode control dropdown was appearing as white when in condition
 groups. Labels in create rules window are now black

---
 .../conditions/rule-composite-condition.ui-component.html | 2 +-
 .../conditions/rule-composite-condition.ui-component.scss | 8 ++++++++
 .../src/rule-details/rule-details.ui-component.scss       | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html
index 3d26bfdb17..597e5cd2b3 100644
--- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html
@@ -16,7 +16,7 @@
       </mat-select>
     </mat-form-field>
 
-    <mat-form-field *ngIf="i > 0" subscriptSizing="dynamic">
+    <mat-form-field *ngIf="i > 0" subscriptSizing="dynamic" class="aca-rule-composite-condition__boolean-mode-control">
       <mat-select
         [formControl]="booleanModeControl">
         <mat-option value="and">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LOGIC_OPERATORS.AND' | translate }}</mat-option>
diff --git a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss
index fab4aabbcc..5e9a0ee62a 100644
--- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss
+++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss
@@ -37,6 +37,14 @@
       & > :nth-child(2) {
         flex: 1;
       }
+
+      .aca-rule-composite-condition__boolean-mode-control #{$mat-form-field-wrapper} {
+        background-color: unset;
+
+        #{$mat-select-disabled} {
+          color: var(--adf-theme-foreground-text-color);
+        }
+      }
     }
 
     &__no-conditions {
diff --git a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss
index 6782eede80..33af0b3440 100644
--- a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss
+++ b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss
@@ -36,6 +36,7 @@
       & > label,
       & > .aca-label {
         font-weight: bold;
+        color: var(--adf-theme-foreground-text-color);
         width: 20%;
         min-width: 100px;
         max-width: 150px;