From 28c007b2e7198f4c1089d84f4ebfa8f6d73daa48 Mon Sep 17 00:00:00 2001
From: Tobias Reischmann <tobias.reischmann@wi.uni-muenster.de>
Date: Thu, 14 Mar 2019 18:53:00 +0100
Subject: [PATCH] MDL-64267 core_message: Moved contact-request to dont cause
 scrollbar

The contact-request-sent-message-container was outside of the
conversation body and caused multiple overflows and thus multiple
scrollbars. Moving it inside does not have an effect on the layout
except one scrollbar is enough now.
---
 ...essage_drawer_view_conversation_body.mustache | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/message/templates/message_drawer_view_conversation_body.mustache b/message/templates/message_drawer_view_conversation_body.mustache
index c584e01b92a..b2c54ac48ce 100644
--- a/message/templates/message_drawer_view_conversation_body.mustache
+++ b/message/templates/message_drawer_view_conversation_body.mustache
@@ -43,15 +43,15 @@
     style="overflow-y: auto; overflow-x: hidden"
 >
     <div class="position-relative h-100" data-region="content-container" style="overflow-y: auto; overflow-x: hidden">
-        <div class="p-3 text-center hidden" data-region="self-conversation-message-container">
-            <p class="m-0">{{#str}} selfconversation, core_message {{/str}}</p>
-            <p class="font-italic font-weight-light" data-region="text">{{#str}} selfconversationdefaultmessage, core_message {{/str}}</p>
-        </div>
-        <div class="p-3 text-center hidden" data-region="contact-request-sent-message-container">
-            <p class="m-0">{{#str}} contactrequestsent, core_message {{/str}}</p>
-            <p class="font-italic font-weight-light" data-region="text"></p>
-        </div>
         <div class="content-message-container hidden h-100 px-2 pb-2 pt-0" data-region="content-message-container" role="log" style="overflow-y: auto; overflow-x: hidden">
+            <div class="p-3 text-center hidden" data-region="self-conversation-message-container">
+                <p class="m-0">{{#str}} selfconversation, core_message {{/str}}</p>
+                <p class="font-italic font-weight-light" data-region="text">{{#str}} selfconversationdefaultmessage, core_message {{/str}}</p>
+            </div>
+            <div class="p-3 text-center hidden" data-region="contact-request-sent-message-container">
+                <p class="m-0">{{#str}} contactrequestsent, core_message {{/str}}</p>
+                <p class="font-italic font-weight-light" data-region="text"></p>
+            </div>
             <div class="hidden text-center p-3" data-region="more-messages-loading-icon-container">{{> core/loading }}</div>
         </div>
         <div class="p-4 w-100 h-100 hidden position-absolute" data-region="confirm-dialogue-container" style="top: 0; background: rgba(0,0,0,0.3);">