From fce3786634bd9f1c49d250a67b8081d949961e4d Mon Sep 17 00:00:00 2001
From: Jill Stingray <stingray@jill.pl>
Date: Tue, 9 Jun 2020 13:00:46 +0300
Subject: [PATCH] Fix overflow in messages

---
 Web/Presenters/templates/Messenger/Index.xml | 2 +-
 Web/static/css/style.css                     | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Web/Presenters/templates/Messenger/Index.xml b/Web/Presenters/templates/Messenger/Index.xml
index 5f927863..3ac3261a 100644
--- a/Web/Presenters/templates/Messenger/Index.xml
+++ b/Web/Presenters/templates/Messenger/Index.xml
@@ -40,7 +40,7 @@
                         alt="Фотография пользователя" />
                     </div>
                     <div class="crp-entry--message---text">
-                        {$lastMsg->getText()|truncate:60}
+                        {$lastMsg->getText()|noescape}
                     </div>
                 </div>
             </div>
diff --git a/Web/static/css/style.css b/Web/static/css/style.css
index d1c563af..981fbffd 100644
--- a/Web/static/css/style.css
+++ b/Web/static/css/style.css
@@ -791,6 +791,13 @@ table.User {
     vertical-align: top;
 }
 
+.crp-entry--message---text {
+    max-height: 45px;
+    max-width: 260px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
 .crp-entry--message---text, .messenger-app--messages---message .time {
     color: #404036;
 }
@@ -828,7 +835,7 @@ table.User {
     width: 300px;
 }
 
-.messenger-app--messages---message ._content span, .messenger-app--messages---message ._content a {
+.messenger-app--messages---message ._content span, .messenger-app--messages---message ._content > a {
     display: block;
 }