From f56c73816e4881f845de7d83d298603c4833ad7a Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Wed, 4 Nov 2020 10:56:07 +0100
Subject: [PATCH] Fix styling of CRV view's close button

---
 addressbook/templates/default/app.css   | 10 ++++++++--
 addressbook/templates/default/view.xet  |  2 +-
 addressbook/templates/pixelegg/app.css  | 16 +++++++++++++++-
 addressbook/templates/pixelegg/app.less |  7 +++++++
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/addressbook/templates/default/app.css b/addressbook/templates/default/app.css
index 0e1cb43c56..9da0565ba2 100644
--- a/addressbook/templates/default/app.css
+++ b/addressbook/templates/default/app.css
@@ -21,13 +21,19 @@ td.addressbook_sidebox_toolbar {
 	height: 32px;
 }
 
-div#addressbook_view_sidebox img.photo {
+.addressbook_view_sidebox img.photo {
 	width: 68px;
 	padding-right: 3px;
 	height: auto;
 	vertical-align: bottom;
 }
-
+div.addressbook_view_sidebox button[id$='_button[close]'] {
+	vertical-align: middle;
+}
+div.addressbook_view_sidebox img[id$='_button[delete]'] {
+	float: right;
+	margin-top: 7px;
+}
 /**
  * new addressbook.edit
  */
diff --git a/addressbook/templates/default/view.xet b/addressbook/templates/default/view.xet
index 5cf7b2c9d1..e458d3b40c 100644
--- a/addressbook/templates/default/view.xet
+++ b/addressbook/templates/default/view.xet
@@ -54,7 +54,7 @@
 					<hbox>
 						<button id="button[edit]" label="open" background_image="1" image="edit" onclick="app.addressbook.view_actions"/>
 						<button id="button[copy]" label="copy" background_image="1" image="copy" onclick="app.addressbook.view_actions"/>
-						<button id="button[close]" label="close" background_image="1" readonly="false" image="close" onclick="app.addressbook.view_actions"/>
+						<button id="button[close]" statustext="close" background_image="1" readonly="false" image="close" onclick="app.addressbook.view_actions"/>
 						<buttononly id="button[delete]" label="delete" image="delete" onclick="app.addressbook.view_actions"/>
 					</hbox>
 				</row>
diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css
index 5312979cfb..9905f5d513 100755
--- a/addressbook/templates/pixelegg/app.css
+++ b/addressbook/templates/pixelegg/app.css
@@ -34,12 +34,19 @@ td.addressbook_sidebox_toolbar {
   vertical-align: bottom;
   height: 32px;
 }
-div#addressbook_view_sidebox img.photo {
+.addressbook_view_sidebox img.photo {
   width: 68px;
   padding-right: 3px;
   height: auto;
   vertical-align: bottom;
 }
+div.addressbook_view_sidebox button[id$='_button[close]'] {
+  vertical-align: middle;
+}
+div.addressbook_view_sidebox img[id$='_button[delete]'] {
+  float: right;
+  margin-top: 7px;
+}
 /**
  * new addressbook.edit
  */
@@ -219,6 +226,13 @@ select#addressbook-index_col_filter\[tid\] {
     font-size: 11px;
     padding: 2px 0 2px 0;
   }
+  div.addressbook_view_sidebox button[id$='_button[close]'] {
+    vertical-align: middle;
+  }
+  div.addressbook_view_sidebox img[id$='_button[delete]'] {
+    float: right;
+    margin-top: 7px;
+  }
   /**
 	 * Give space to both contact view & infolog list
 	 */
diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less
index cd647351ba..550bb846ef 100755
--- a/addressbook/templates/pixelegg/app.less
+++ b/addressbook/templates/pixelegg/app.less
@@ -75,6 +75,13 @@
 			.fontsize_m;
 			padding: 2px 0 2px 0;
 		}
+		button[id$='_button[close]'] {
+			vertical-align: middle;
+		}
+		img[id$='_button[delete]'] {
+			float: right;
+			margin-top: 7px;
+		}
 	}
 
 	/**