Merge pull request #129 from netgrif/NAE-1739

[NAE-1739] Currency symbol is displayed on new line, when editing currency field

Author: machacjozef

projects/netgrif-components/nae-theme.scss

@@ -37,3 +37,8 @@
     margin-top: 16px !important;
     margin-bottom: 16px !important;
 }
+
+.mat-form-field .mat-form-field-prefix {
+    position: initial !important;
+    padding-right: 4px !important;
+}

projects/netgrif-components/src/lib/data-fields/data-field.theme.scss

@@ -38,7 +38,7 @@
         font-weight: 700 !important;
     }
 
-    .enum-icon-item:hover {
+    .enum-icon-item-hover:hover {
         color: mat.get-color-from-palette($primary) !important;
     }
 

projects/netgrif-components/src/lib/data-fields/enumeration-field/enumeration-icon-field/enumeration-icon-field.component.html

@@ -3,7 +3,7 @@
         <nc-required-label *ngIf="enumerationField.behavior.required" [isIn]="true"></nc-required-label>
         <br></mat-label>
     <div *ngFor="let option of enumerationField.choices; let i = index">
-        <div class="enum-icon-item enum-icon-item-row" (click)="setEnumValue(option.key)" [ngClass]="{'enum-icon-item-active': isSelected(option.key)}">
+        <div class="enum-icon-item enum-icon-item-row" (click)="setEnumValue(option.key)" [ngClass]="{'enum-icon-item-active': isSelected(option.key), 'enum-icon-item-hover': !formControlRef.disabled}">
             <mat-icon *ngIf="resolveIconType(option.key) === 'material'">{{resolveIconValue(option.key)}}</mat-icon>
             <mat-icon *ngIf="resolveIconType(option.key) === 'svg'" [svgIcon]="resolveIconValue(option.key)"></mat-icon>
             <span fxFlex class="enum-icon-text">{{option.value}}</span>

projects/netgrif-components/src/lib/data-fields/file-field/file-field.component.scss

@@ -105,8 +105,8 @@
 .border-LGBTQ {
     border: 5px solid transparent;
     border-image: linear-gradient(to bottom right, #B827FC 0%, #2C90FC 25%, #B8FD33 50%, #FEC837 75%, #FD1892 100%);
-    animation: rainbow 10s infinite;
     border-image-slice: 1;
+    animation: rainbow 10s infinite;
 }
 @keyframes rainbow {
     0% {  border-image: linear-gradient(to bottom right, #B827FC 0%, #2C90FC 25%, #B8FD33 50%, #FEC837 75%, #FD1892 100%);

projects/netgrif-components/src/lib/data-fields/number-field/number-currency-field/number-currency-field.component.html

@@ -1,5 +1,6 @@
 <mat-form-field [appearance]="numberField.materialAppearance" class="full-width" color="primary">
     <mat-label *ngIf="!showLargeLayout.value">{{numberField.title}}</mat-label>
+    <span matPrefix *ngIf="isNumberType()">{{this.numberField.component.properties['code'] ?? ''}}</span>
     <input matInput
            [type]="fieldType"
            [value]="transformedValue"
@@ -11,4 +12,3 @@
     <mat-hint>{{numberField.description}}</mat-hint>
     <mat-error *ngIf="numberField.isInvalid(formControlRef)">{{getErrorMessage()}}</mat-error>
 </mat-form-field>
-<mat-label class="currency-label" *ngIf="isNumberType()">{{getCurrencySymbol()}}</mat-label>

projects/netgrif-components/src/lib/data-fields/number-field/number-currency-field/number-currency-field.component.scss

@@ -1,8 +1,5 @@
 .full-width {
+    display: block;
     margin: 0 auto;
-    width: 90%;
-}
-
-.currency-label{
-    margin-left: 5px;
+    width: 100%;
 }