From 3fa95d6bd822c52092128cec4e0a3dea9c1ac6b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Baptiste=20Mah=C3=A9?= <mahe.baptiste.19@gmail.com>
Date: Thu, 19 Mar 2020 10:53:58 +0100
Subject: [PATCH] [AAE-1579] Fixing the style of the prefix of amount widget
 (#5546)

* [AAE-1579] Fix amount widget prefix

* top of prefix fixed in modeler

* [AAE-1579] prefix color get from theming

* [AAE-1579] fix color and removed useless include

* [AAE-1579] remove useless import and prefix red when input empty and required
---
 .../widgets/amount/amount.widget.scss         | 56 +++++++++++--------
 lib/core/styles/_index.scss                   |  2 +
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/lib/core/form/components/widgets/amount/amount.widget.scss b/lib/core/form/components/widgets/amount/amount.widget.scss
index 03b73447a1..19a730df9d 100644
--- a/lib/core/form/components/widgets/amount/amount.widget.scss
+++ b/lib/core/form/components/widgets/amount/amount.widget.scss
@@ -1,28 +1,40 @@
 @import '../form';
 
-.adf {
-    &-amount-widget {
-        width: 100%;
+@mixin adf-amount-widget-theme($theme) {
+    $foreground: map-get($theme, foreground);
 
-        .mat-input-element {
-            margin-left: 13px;
-            margin-right: 13px;
+    .adf {
+        &-amount-widget {
+            width: 100%;
+
+            .mat-input-element {
+                margin-left: 13px;
+                margin-right: 13px;
+            }
+        }
+
+        &-amount-widget__container .mat-form-field-label-wrapper {
+            top: 17px;
+            left: 12px;
+            right: 12px;
+        }
+
+        &-amount-widget__input {
+
+            .mat-focused {
+                transition: none;
+            }
+
+            &:not(.mat-focused):not(.mat-form-field-invalid) {
+                .adf-amount-widget__prefix-spacing {
+                    color: mat-color($foreground, secondary-text);
+                }
+            }
+        }
+
+        &-amount-widget__prefix-spacing {
+            position: absolute;
+            top: 12px;
         }
     }
-
-    &-amount-widget__container .mat-form-field-label-wrapper {
-        top: 17px;
-        left: 12px;
-        right: 12px;
-    }
-
-    &-amount-widget__input .mat-focused {
-        transition: none;
-    }
-
-    &-amount-widget__prefix-spacing {
-        position: absolute;
-        top: 12px;
-    }
 }
-
diff --git a/lib/core/styles/_index.scss b/lib/core/styles/_index.scss
index 8a5b186638..31c2d61ea6 100644
--- a/lib/core/styles/_index.scss
+++ b/lib/core/styles/_index.scss
@@ -8,6 +8,7 @@
 @import '../form/components/widgets/dynamic-table/dynamic-table.widget';
 @import '../form/components/widgets/form';
 @import '../form/components/widgets/hyperlink/hyperlink.widget';
+@import '../form/components/widgets/amount/amount.widget';
 @import '../form/components/widgets/people/people.widget';
 @import '../info-drawer/info-drawer-layout.component';
 @import '../login/components/login.component';
@@ -45,6 +46,7 @@
     @include adf-dynamic-table-theme($theme);
     @include adf-form-theme($theme);
     @include adf-hyperlink-widget-theme($theme);
+    @include adf-amount-widget-theme($theme);
     @include adf-form-people-widget-theme($theme);
     @include adf-info-drawer-theme($theme);
     @include adf-login-theme($theme);