From 6ebe5a1679c0a185d9ec2c46c476b157c9861523 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Thu, 20 Sep 2018 10:38:04 +0200
Subject: [PATCH] Fix infolog encryption and timestamp buttons misalignment

---
 infolog/templates/default/app.css  |  6 +++---
 infolog/templates/default/edit.xet |  8 +++++---
 infolog/templates/pixelegg/app.css | 10 +++++-----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/infolog/templates/default/app.css b/infolog/templates/default/app.css
index 9d5eb8aa2a..37e88e1d27 100644
--- a/infolog/templates/default/app.css
+++ b/infolog/templates/default/app.css
@@ -62,12 +62,12 @@ button.infologExtraButton {
 button.infologExtraButton:hover {
 	background-size: 16px;
 }
-td.infologEncrypt {
+div.et2_hbox.tab_toolbar {
 	position: relative;
 }
 button#infolog-edit_encrypt {
 	position: absolute;
-	right: -2px;
+	right: 0px;
 	top: 3px;
 }
 td.infologTimestamp {
@@ -75,7 +75,7 @@ td.infologTimestamp {
 }
 button#infolog-edit_timestamp {
 	position: absolute;
-	right: -25px;
+	right: 29px;
 	top: 3px;
 }
 div#infolog-edit_infolog-edit-description {
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index a24edade2b..f8cc33154f 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -174,9 +174,11 @@
 					<date-time statustext="til when should the ToDo or Phonecall be finished" id="info_enddate" class="et2_fullWidth" span="4"/>
 				</row>
 				<row class="et2_toolbar">
-					<description id="spacer" span="5"/>
-					<timestamper statustext="Insert timestamp into description field" id="timestamp" class="infologExtraButton infologTimestamp" target="info_des"/>
-					<buttononly statustext="Encrypt description" id="encrypt" class="infologExtraButton infologEncrypt" background_image="1" image="lock" onclick="app.infolog.toggleEncrypt"/>
+					<description id="spacer" span="6"/>
+					<hbox class="tab_toolbar">
+						<timestamper statustext="Insert timestamp into description field" id="timestamp" class="infologExtraButton infologTimestamp" target="info_des"/>
+						<buttononly statustext="Encrypt description" id="encrypt" class="infologExtraButton infologEncrypt" background_image="1" image="lock" onclick="app.infolog.toggleEncrypt"/>
+					</hbox>
 				</row>
 				<row>
 					<tabbox id="tabs" class="et2_nowrap" span="all" width="100%" tab_height="250px">
diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css
index fc63496b71..13afb931de 100755
--- a/infolog/templates/pixelegg/app.css
+++ b/infolog/templates/pixelegg/app.css
@@ -39,7 +39,7 @@
 }
 .normal,
 .normal_done {
-  color: #000000;
+  color: black;
 }
 .high {
   color: #cc0000;
@@ -129,12 +129,12 @@ button.infologExtraButton {
 button.infologExtraButton:hover {
   background-size: 16px;
 }
-td.infologEncrypt {
+div.et2_hbox.tab_toolbar {
   position: relative;
 }
 button#infolog-edit_encrypt {
   position: absolute;
-  right: -2px;
+  right: 0px;
   top: 3px;
 }
 td.infologTimestamp {
@@ -142,7 +142,7 @@ td.infologTimestamp {
 }
 button#infolog-edit_timestamp {
   position: absolute;
-  right: -25px;
+  right: 29px;
   top: 3px;
 }
 div#infolog-edit_infolog-edit-description {
@@ -198,7 +198,7 @@ div#infolog-edit_infolog-edit-description {
   height: auto;
 }
 div#infolog-edit_info_contact input.ui-autocomplete-input span.ui-icon-close {
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   background-size: contain;
   background-position: 5px 5px;
   top: 9px !important;