From 7e96f98505c6ecf75360bbe42854f7206f102e18 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Thu, 2 May 2019 11:53:16 +0200
Subject: [PATCH] Fix fullwidth issue in AB edit dialog

---
 addressbook/templates/default/app.css   |  3 ++-
 addressbook/templates/default/edit.xet  |  8 +++++---
 addressbook/templates/pixelegg/app.css  | 18 +++++++++++++++++-
 addressbook/templates/pixelegg/app.less | 16 ++++++++++++++++
 api/templates/default/etemplate2.css    |  2 --
 5 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/addressbook/templates/default/app.css b/addressbook/templates/default/app.css
index 91e0f678a0..c63cfb1ea8 100644
--- a/addressbook/templates/default/app.css
+++ b/addressbook/templates/default/app.css
@@ -63,6 +63,7 @@ div.addressbook_edit_general_picture img {
 	top: 55px;
 	left: 102px;
 	z-index: 1;
+	padding-right: 10px;
 }
 .custom_country {
 	display: none;
@@ -134,7 +135,7 @@ select#addressbook-index_col_filter\[tid\] {
 #addressbook-edit_adr_one_region, #addressbook-edit_adr_two_region {
 	width: 130px;
     vertical-align: middle;
-    margin-left: 3px;
+    margin-left: 1px;
 }
 .smime_section_border {border-top: 1px solid #e5e5e5;}
 .smime_section_border> * {padding-top: 10px;}
\ No newline at end of file
diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet
index be1e87fabb..ed7fc289a4 100644
--- a/addressbook/templates/default/edit.xet
+++ b/addressbook/templates/default/edit.xet
@@ -136,9 +136,11 @@
 					<url-phone id="tel_car" tabindex="26" class="et2_fullWidth"/>
 					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_car,&amp;hearts;"/>
 					<description disabled="@no_tid" for="tid" value="Type"/>
-					<menulist disabled="@no_tid">
-						<menupopup id="tid" no_lang="1" class="et2_fullWidth" onchange="1"/>
-					</menulist>
+					<hbox width="102%">
+						<menulist disabled="@no_tid">
+							<menupopup id="tid" no_lang="1" class="et2_fullWidth" onchange="1"/>
+						</menulist>
+					</hbox>
 					<description/>
 				</row>
 			</rows>
diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css
index bc828c5164..22d44b31be 100755
--- a/addressbook/templates/pixelegg/app.css
+++ b/addressbook/templates/pixelegg/app.css
@@ -76,6 +76,7 @@ div.addressbook_edit_general_picture img {
   top: 55px;
   left: 102px;
   z-index: 1;
+  padding-right: 10px;
 }
 .custom_country {
   display: none;
@@ -161,7 +162,7 @@ select#addressbook-index_col_filter\[tid\] {
 #addressbook-edit_adr_two_region {
   width: 130px;
   vertical-align: middle;
-  margin-left: 3px;
+  margin-left: 1px;
 }
 .smime_section_border {
   border-top: 1px solid #e5e5e5;
@@ -375,4 +376,19 @@ select#addressbook-index_col_filter\[tid\] {
   #addressbook-edit_addressbook-edit-general .et2_label {
     margin-right: 6px;
   }
+  #addressbook_edit_adr_one_countrycode_chzn,
+  #addressbook_edit_adr_two_countrycode_chzn {
+    margin-top: 3px;
+  }
+  #addressbook_edit_adr_one_countrycode_chzn a.et2_country-select,
+  #addressbook_edit_adr_two_countrycode_chzn a.et2_country-select {
+    width: 99%;
+    padding-left: 5px;
+    left: 1px;
+    border-radius: 0;
+  }
+  #addressbook-edit_adr_one_region .ms-ctn form-control,
+  #addressbook-edit_adr_two_region .ms-ctn form-control {
+    padding-left: 13px;
+  }
 }
diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less
index 0c28f2d855..33a767a047 100755
--- a/addressbook/templates/pixelegg/app.less
+++ b/addressbook/templates/pixelegg/app.less
@@ -170,5 +170,21 @@
 	#addressbook-edit_addressbook-edit-general{
 		.et2_label {margin-right: 6px;}
 	}
+
+	#addressbook_edit_adr_one_countrycode_chzn,
+	#addressbook_edit_adr_two_countrycode_chzn {
+		margin-top: 3px;
+		a.et2_country-select {
+			width: 99%;
+			padding-left: 5px;
+			left: 1px;
+			border-radius: 0;
+		}
+	}
+
+	#addressbook-edit_adr_one_region,
+	#addressbook-edit_adr_two_region {
+		.ms-ctn form-control {padding-left: 13px;}
+	}
 }
 
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 46c97472fe..cc0be6bf3d 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -2653,8 +2653,6 @@ ul.et2_nowrap, div.et2_nowrap{
 	float: right;
 }
 
-.et2_fullWidth input.et2_date { width:95%;}
-
 /*et2_image_widget*/
 div.et2_image_tooltipPopup {
 	background: white;