From c6ade488263588eb6397a07d146691db0981552b Mon Sep 17 00:00:00 2001
From: ilhan <ilhan.myumyun@sap.com>
Date: Wed, 18 Dec 2019 10:56:40 +0200
Subject: [PATCH 1/2] fix(ui5-select): fix component baseline alignment

---
 packages/main/src/themes/Select.css |  7 +------
 packages/main/test/pages/Input.html | 26 +++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/packages/main/src/themes/Select.css b/packages/main/src/themes/Select.css
index d40e4518f0cc..7e971643b9ca 100644
--- a/packages/main/src/themes/Select.css
+++ b/packages/main/src/themes/Select.css
@@ -7,6 +7,7 @@
 	display: flex;
 	outline: none;
 	cursor: pointer;
+	overflow: hidden;
 }
 
 .ui5-select-label-root {
@@ -29,10 +30,4 @@
 
 :host(:not([disabled])) {
 	cursor: pointer;
-}
-
-:host([value-state="Error"]),
-:host([value-state="Warning"]),
-:host([value-state="Success"]) {
-	overflow: hidden;
 }
\ No newline at end of file
diff --git a/packages/main/test/pages/Input.html b/packages/main/test/pages/Input.html
index 2a797dd7369b..157188f2fcf8 100644
--- a/packages/main/test/pages/Input.html
+++ b/packages/main/test/pages/Input.html
@@ -90,14 +90,34 @@ <h3> Input type 'Tel'</h3>
 	<h3> Input type 'URL'</h3>
 	<ui5-input id="input-url" style="width:100%" type="URL"></ui5-input>
 
-	<h3> Input and button and select</h3>
+	<h3> Inputs alignment</h3>
 	<ui5-button>Press</ui5-button>
-	<ui5-input style="width: 10rem;" value="input"></ui5-input>
-	<ui5-select id="mySelect2"style="width: 10rem;">
+	<ui5-datepicker style="width: 6rem;" id='dp5'
+			placeholder='Delivery Date...'
+			title='Delivery Date!'>
+	</ui5-datepicker>
+
+	<ui5-datepicker style="width: 6rem;" id='dp5'
+			placeholder='Delivery Date...'
+			value-state="Error"
+			title='Delivery Date!'>
+	</ui5-datepicker>
+
+	<ui5-select id="mySelect2"style="width: 6rem;">
 		<ui5-option>Cozy</ui5-option>
 		<ui5-option selected>Compact</ui5-option>
 		<ui5-option>Condensed</ui5-option>
 	</ui5-select>
+	
+	<ui5-input style="width: 6rem;" value="input" value-state="Error">
+		<ui5-icon slot="icon" name="message-warning"></ui5-icon>
+	</ui5-input>
+	<ui5-select id="mySelect2"style="width: 6rem;" value-state="Error">
+		<ui5-option>Cozy</ui5-option>
+		<ui5-option selected>Compact</ui5-option>
+		<ui5-option>Condensed</ui5-option>
+	</ui5-select>
+	<ui5-multi-combobox value-state="Error" style="width: 6rem;"></ui5-multi-combobox>
 
 	<script>
 		var sap_database_entries = [{ key: "Afg", text: "Afghanistan" }, { key: "Arg", text: "Argentina" }, { key: "Alb", text: "Albania" }, { key: "Arm", text: "Armenia" }, { key: "Alg", text: "Algeria" }, { key: "And", text: "Andorra" }, { key: "Ang", text: "Angola" }, { key: "Ast", text: "Austria" }, { key: "Aus", text: "Australia" }, { key: "Aze", text: "Azerbaijan" }, { key: "Aruba", text: "Aruba" }, { key: "Antigua", text: "Antigua and Barbuda" }, { key: "Bel", text: "Belarus" }, { key: "Bel", text: "Belgium" }, { key: "Bg", text: "Bulgaria" }, { key: "Bra", text: "Brazil" }, { key: "Ch", text: "China" }, { key: "Cub", text: "Cuba" }, { key: "Chil", text: "Chili" }, { key: "Lat", text: "Latvia" }, { key: "Lit", text: "Litva" }, { key: "Prt", text: "Portugal" }, { key: "Sen", text: "Senegal" }, { key: "Ser", text: "Serbia" }, { key: "Afg", text: "Seychelles" }, { key: "Sierra", text: "Sierra Leone" }, { key: "Sgp", text: "Singapore" }, { key: "Sint", text: "Sint Maarten" }, { key: "Slv", text: "Slovakia" }, { key: "Slo", text: "Slovenia" }];

From 55c55ef05040a8236855f9049a2114a9847e6187 Mon Sep 17 00:00:00 2001
From: ilhan <ilhan.myumyun@sap.com>
Date: Wed, 18 Dec 2019 11:30:49 +0200
Subject: [PATCH 2/2] fix icon padding

---
 packages/main/src/themes/base/InputIcon-parameters.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/main/src/themes/base/InputIcon-parameters.css b/packages/main/src/themes/base/InputIcon-parameters.css
index ac52fd6d03b3..3e5001f4544d 100644
--- a/packages/main/src/themes/base/InputIcon-parameters.css
+++ b/packages/main/src/themes/base/InputIcon-parameters.css
@@ -1,3 +1,3 @@
 :root {
-	--_ui5-input-icon-padding: .56275rem .6875rem;
+	--_ui5-input-icon-padding: .5625rem .6875rem;
 }
\ No newline at end of file