From e04ddca6ae2428209ed4de2af1cf83916c3c9cd1 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Thu, 19 Mar 2015 00:04:35 +0300
Subject: [PATCH] Improved reply message styles

---
 app/css/app.css       | 13 +++++++++++--
 app/js/controllers.js |  2 +-
 app/js/directives.js  |  2 +-
 app/js/services.js    |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/css/app.css b/app/css/app.css
index 1f6e1f07..7b44bbc0 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -1768,7 +1768,6 @@ div.im_message_body {
   text-decoration: none;
   margin-bottom: 5px;
   margin-top: 2px;
-  height: 36px;
   overflow: hidden;
 }
 .im_message_reply_wrap:hover {
@@ -1800,7 +1799,7 @@ div.im_message_body {
   margin-bottom: 3px;
 }
 .im_message_reply_loading {
-  padding: 12px 0;
+  padding: 7px 0 8px;
 }
 .im_reply_message_service,
 .im_reply_message_media {
@@ -1813,10 +1812,20 @@ div.im_message_body {
   text-overflow: ellipsis;
   margin-bottom: 1px;
 }
+.im_message_reply_thumbed .im_message_reply_wrap,
+.im_message_reply_thumbed .im_message_reply_border {
+  height: 42px;
+}
+.im_message_reply_thumbed .im_message_reply_author {
+  margin-top: 4px;
+}
 .im_message_reply_thumbed .im_message_reply_author,
 .im_message_reply_thumbed .im_message_reply_body {
   margin-left: 52px;
 }
+.im_message_reply_wrap .im_message_reply_thumbed {
+  margin-bottom: 4px;
+}
 
 
 a.im_message_fwd_photo {
diff --git a/app/js/controllers.js b/app/js/controllers.js
index 2d79109d..b92c8420 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -1623,7 +1623,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
     }
 
     function replySelect(messageID) {
-      $scope.draftMessage.replyToMessage = AppMessagesManager.wrapForHistory(messageID);
+      $scope.draftMessage.replyToMessage = AppMessagesManager.wrapForDialog(messageID);
       $scope.$broadcast('ui_peer_reply');
     }
 
diff --git a/app/js/directives.js b/app/js/directives.js
index a425a25e..6fb1cf64 100755
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -339,7 +339,7 @@ angular.module('myApp.directives', ['myApp.filters'])
         var messageID = message.id;
         var stopWaiting = $scope.$on('messages_downloaded', function (e, msgIDs) {
           if (msgIDs.indexOf(messageID) != -1) {
-            $scope.replyMessage = AppMessagesManager.wrapForHistory(messageID);
+            $scope.replyMessage = AppMessagesManager.wrapForDialog(messageID);
             updateMessage($scope, element);
             stopWaiting();
           }
diff --git a/app/js/services.js b/app/js/services.js
index 3f3755bd..16f2d377 100755
--- a/app/js/services.js
+++ b/app/js/services.js
@@ -2003,7 +2003,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
     var replyToMsgID = message.reply_to_msg_id;
     if (replyToMsgID) {
       if (messagesStorage[replyToMsgID]) {
-        message.reply_to_msg = wrapForHistory(replyToMsgID);
+        message.reply_to_msg = wrapForDialog(replyToMsgID);
       } else {
         message.reply_to_msg = {id: replyToMsgID, loading: true};
         if (needSingleMessages.indexOf(replyToMsgID) == -1) {