From 61e2f257cf6c9075d4ae1745051e618decf050f2 Mon Sep 17 00:00:00 2001
From: Vito <vito.albano@alfresco.com>
Date: Wed, 27 Jun 2018 09:43:30 +0100
Subject: [PATCH] [ADF-3266] fixed style for amount widget (#3531)

---
 .../widgets/amount/amount.widget.html         |  7 +++---
 .../widgets/amount/amount.widget.scss         | 25 ++++++++++++-------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/lib/core/form/components/widgets/amount/amount.widget.html b/lib/core/form/components/widgets/amount/amount.widget.html
index e70e41eb77..1f51c6d0a9 100644
--- a/lib/core/form/components/widgets/amount/amount.widget.html
+++ b/lib/core/form/components/widgets/amount/amount.widget.html
@@ -1,5 +1,5 @@
 <div class="adf-amount-widget__container adf-amount-widget {{field.className}}" [class.adf-invalid]="!field.isValid" [class.adf-readonly]="field.readOnly">
-    <mat-form-field floatPlaceholder="never" class="adf-amount-widget__input">
+    <mat-form-field class="adf-amount-widget__input">
         <label class="adf-label" [attr.for]="field.id">{{field.name}}<span *ngIf="isRequired()">*</span></label>
         <span matPrefix class="adf-amount-widget__prefix-spacing"> {{currency }}</span>
         <input matInput
@@ -7,13 +7,12 @@
                 type="text"
                 [id]="field.id"
                 [required]="isRequired()"
+                [placeholder]="field.placeholder"
                 [value]="field.value"
                 [(ngModel)]="field.value"
                 (ngModelChange)="onFieldChanged(field)"
-                [disabled]="field.readOnly"
-                placeholder="{{field.placeholder}}">
+                [disabled]="field.readOnly">
     </mat-form-field>
     <error-widget [error]="field.validationSummary" ></error-widget>
     <error-widget *ngIf="isInvalidFieldRequired()" required="{{ 'FORM.FIELD.REQUIRED' | translate }}"></error-widget>
 </div>
-
diff --git a/lib/core/form/components/widgets/amount/amount.widget.scss b/lib/core/form/components/widgets/amount/amount.widget.scss
index efa92993e4..3adb353254 100644
--- a/lib/core/form/components/widgets/amount/amount.widget.scss
+++ b/lib/core/form/components/widgets/amount/amount.widget.scss
@@ -5,20 +5,27 @@
         width: 100%;
         vertical-align: baseline !important;
 
-        .mat-input-element {
-            margin-left: 11px;
-        }
-
-        .mat-input-prefix {
-            position: absolute;
-            margin-top: 58px;
-        }
-
         .mat-input-placeholder {
             margin-top: 5px;
             display: none;
         }
 
+        .mat-form-field-flex{
+            position: relative;
+            padding-top: 18.5px;
+        }
+
+        .mat-form-field-infix{
+            position: static;
+            padding-top: 19px;
+        }
+
+        .adf-label{
+            position: absolute;
+            top: 18.5px;
+            left:0;
+        }
+
     }
 
     &-amount-widget__container {