From 84d4a1b6ba0db1cd5c2427c2fae3424745d6cbe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Popovics=20Andr=C3=A1s?=
 <popovicsandras@users.noreply.github.com>
Date: Mon, 2 Oct 2017 14:32:06 +0100
Subject: [PATCH] Fix input stylings for adf-people-search and modify existing
 fix for form inputs (#2405)

---
 .../src/components/form.component.scss        |   2 +-
 .../components/people-search.component.scss   | 126 +++++++++---------
 .../src/components/people-search.component.ts |   8 +-
 3 files changed, 72 insertions(+), 64 deletions(-)

diff --git a/ng2-components/ng2-activiti-form/src/components/form.component.scss b/ng2-components/ng2-activiti-form/src/components/form.component.scss
index b88ab406b6..27ae3ec7fe 100644
--- a/ng2-components/ng2-activiti-form/src/components/form.component.scss
+++ b/ng2-components/ng2-activiti-form/src/components/form.component.scss
@@ -39,6 +39,6 @@ form-field {
     .mat-input-element {
         font-size: 14px;
         padding-top: 8px;
-        line-height: 20px;
+        line-height: normal;
     }
 }
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.scss
index 3aa290bec3..6af1ff650f 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.scss
+++ b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.scss
@@ -3,71 +3,75 @@
     $accent: map-get($theme, accent);
     $warn: map-get($theme, warn);
 
-    :host {
+    .adf-people-search {
         width: 100%;
-    }
 
-    .activiti-label {
-        font-weight: bolder;
-    }
-
-    .fix-element-user-list {
-        padding-top: 0px;
-        padding-right: 0px;
-        padding-bottom: 0px;
-        padding-left: 0px;
-    }
-
-    .search-text-header {
-        font-weight: bold;
-        opacity: 0.54;
-    }
-
-    .search-text-container {
-        width: 100%;
-    }
-
-    .search-list-container {
-        max-height: 152px;
-        width: 100%;
-        overflow-y: auto;
-    }
-
-    adf-people-list /deep/ adf-datatable /deep/ thead {
-        display: none;
-    }
-
-    .search-list-action-container {
-        border-top: 1px solid #eee;
-        text-align: right;
-        padding: 5px 0px;
-        margin-top: 5px;
-        > button {
-            opacity: 0.54;
+        .activiti-label {
             font-weight: bolder;
-            &:hover {
-                color: mat-color($primary);
+        }
+    
+        .fix-element-user-list {
+            padding-top: 0px;
+            padding-right: 0px;
+            padding-bottom: 0px;
+            padding-left: 0px;
+        }
+    
+        .search-text-header {
+            font-weight: bold;
+            opacity: 0.54;
+        }
+    
+        .search-text-container {
+            width: 100%;
+
+            input {
+                line-height: normal;
             }
         }
-    }
-
-    .people-pic {
-        background: mat-color($primary);
-        width: 30px;
-        padding: 10px 5px;
-        border-radius: 90%;
-        color: #fff;
-        text-align: center;
-        font-weight: bolder;
-        font-size: 18px;
-        text-transform: uppercase;
-        vertical-align: text-bottom;
-    }
-
-    .people-img {
-        border-radius: 90%;
-        width: 40px;
-        height: 40px;
-        vertical-align: middle;
+    
+        .search-list-container {
+            max-height: 152px;
+            width: 100%;
+            overflow-y: auto;
+        }
+    
+        adf-people-list /deep/ adf-datatable /deep/ thead {
+            display: none;
+        }
+    
+        .search-list-action-container {
+            border-top: 1px solid #eee;
+            text-align: right;
+            padding: 5px 0px;
+            margin-top: 5px;
+            > button {
+                opacity: 0.54;
+                font-weight: bolder;
+                &:hover {
+                    color: mat-color($primary);
+                }
+            }
+        }
+    
+        .people-pic {
+            background: mat-color($primary);
+            width: 30px;
+            padding: 10px 5px;
+            border-radius: 90%;
+            color: #fff;
+            text-align: center;
+            font-weight: bolder;
+            font-size: 18px;
+            text-transform: uppercase;
+            vertical-align: text-bottom;
+        }
+    
+        .people-img {
+            border-radius: 90%;
+            width: 40px;
+            height: 40px;
+            vertical-align: middle;
+        }    
     }
 }
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.ts
index 414aa48b46..2443ff32be 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Component, Directive, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, Directive, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
 import { FormControl } from '@angular/forms';
 import { Observable } from 'rxjs/Observable';
 import { User } from '../models/user.model';
@@ -23,7 +23,11 @@ import { User } from '../models/user.model';
 @Component({
     selector: 'adf-people-search, activiti-people-search',
     templateUrl: './people-search.component.html',
-    styleUrls: ['./people-search.component.scss']
+    styleUrls: ['./people-search.component.scss'],
+    host: {
+        'class': 'adf-people-search'
+    },
+    encapsulation: ViewEncapsulation.None
 })
 
 export class PeopleSearchComponent implements OnInit {