From 673ada299aa77a8106914709a5314d23034ee686 Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Fri, 2 Jun 2017 21:32:24 +0300
Subject: [PATCH] Fix "Collapse the TO" (#1199)

---
 dev/Styles/MessageView.less                   | 29 +++++----------
 .../templates/Views/User/MailMessageView.html | 37 ++++++++-----------
 2 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/dev/Styles/MessageView.less b/dev/Styles/MessageView.less
index 2dbfd3469..9d3580519 100644
--- a/dev/Styles/MessageView.less
+++ b/dev/Styles/MessageView.less
@@ -165,25 +165,12 @@ html.rl-no-preview-pane {
 				vertical-align: middle;
 			}
 
-			.senderParent {
-				margin: 7px 0;
-				&.-top {
-					margin-top: 0;
-				}
-				&.-middle {
-					margin-top: -5px;
-					margin-bottom: -5px;
-				}
-				&.-bottom {
-					margin-bottom: 0;
-				}
-			}
-
 			.messageButtons {
 				margin-top: 5px;
 			}
 
 			.informationShort {
+				margin: 4px 0;
 				margin-left: 5px;
 				margin-right: 50px;
 
@@ -191,18 +178,20 @@ html.rl-no-preview-pane {
 					.g-ui-link;
 				}
 
-				&.-bottom {
-					margin-right: 5px;
-					max-height: 100px;
-					overflow-y: auto;
-				}
-
 				html.rl-mobile &{
 					text-overflow: ellipsis;
 					overflow: hidden;
 					white-space: nowrap;
 				}
 			}
+
+			.informationShortWrp {
+				max-height: 100px;
+				overflow-y: auto;
+				min-height: 30px;
+				margin-top: 4px;
+			}
+
 			.informationFull {
 				margin-top: 10px;
 				border: 1px solid #ddd;
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
index a6360b2c0..8bc97e8a7 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -238,38 +238,31 @@
 							<div>
 								<img class="fromPic" data-bind="visible: viewUserPicVisible, attr: {'src': viewUserPic() }">
 								<div style="overflow: hidden;">
-									<div class="senderParent -top">
-										<div class="informationShort -top" data-bind="event: { 'dblclick': toggleFullScreen }">
-											<span>
-												<span class="from" data-bind="html: viewFromShort, title: viewFrom"></span>
-												<span data-bind="visible: viewFromDkimVisibility">
-													&nbsp;
-													<i data-bind="css: viewFromDkimStatusIconClass, title: viewFromDkimStatusTitle" />
-												</span>
+									<div class="informationShort" data-bind="event: { 'dblclick': toggleFullScreen }">
+										<span>
+											<span class="from" data-bind="html: viewFromShort, title: viewFrom"></span>
+											<span data-bind="visible: viewFromDkimVisibility">
+												&nbsp;
+												<i data-bind="css: viewFromDkimStatusIconClass, title: viewFromDkimStatusTitle" />
 											</span>
-											<span data-bind="visible: 0 < viewTimeStamp()">
-												(<span class="date" data-moment-format="FULL" data-bind="moment: viewTimeStamp"></span>)
-											</span>
-										</div>
-										<div class="clearfix"></div>
+										</span>
+										<span data-bind="visible: 0 < viewTimeStamp()">
+											(<span class="date" data-moment-format="FULL" data-bind="moment: viewTimeStamp"></span>)
+										</span>
 									</div>
-									<div class="senderParent" data-bind="visible: viewTo, css: {'-middle': viewCc(), '-bottom': !viewCc()}">
-										<div class="informationShort" data-bind="event: { 'dblclick': toggleFullScreen }, css: {'-middle': viewCc(), '-bottom': !viewCc()}">
+									<div class="informationShortWrp">
+										<div class="informationShort" data-bind="visible: viewTo, event: { 'dblclick': toggleFullScreen }">
 											<span>
 												<span class="i18n uiLabel labelTo" data-i18n="MESSAGE/LABEL_TO"
-													 ></span>:&nbsp;<span class="to" data-bind="text: viewTo"></span>
+													></span>:&nbsp;<span class="to" data-bind="text: viewTo"></span>
 											</span>
 										</div>
-										<div class="clearfix"></div>
-									</div>
-									<div class="senderParent -bottom" data-bind="visible: viewCc">
-										<div class="informationShort -bottom" data-bind="event: { 'dblclick': toggleFullScreen }">
+										<div class="informationShort" data-bind="visible: viewCc, event: { 'dblclick': toggleFullScreen }">
 											<span>
 												<span class="i18n uiLabel labelTo" data-i18n="MESSAGE/LABEL_CC"
-													 ></span>:&nbsp;<span class="to" data-bind="text: viewCc"></span>
+													></span>:&nbsp;<span class="to" data-bind="text: viewCc"></span>
 											</span>
 										</div>
-										<div class="clearfix"></div>
 									</div>
 								</div>
 								<div class="clearfix"></div>