From 408efe43c55e037f11600b65ab3d18662f8eb2c5 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 1/3] 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.
---
 .../message_drawer_view_conversation_body.mustache        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/message/templates/message_drawer_view_conversation_body.mustache b/message/templates/message_drawer_view_conversation_body.mustache
index a87e91527b0..4407c28e14f 100644
--- a/message/templates/message_drawer_view_conversation_body.mustache
+++ b/message/templates/message_drawer_view_conversation_body.mustache
@@ -43,11 +43,11 @@
     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="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="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);">

From 7d02fe560ad7f8902e445ef4f5afe452575c3c54 Mon Sep 17 00:00:00 2001
From: Tobias Reischmann <tobias.reischmann@wi.uni-muenster.de>
Date: Thu, 14 Mar 2019 18:59:01 +0100
Subject: [PATCH 2/3] MDL-64267 core_message: Removed pb-2 from
 message-container

The padding at the bottom broke layout in clean theme since it caused an
overflow, which resulted in a second scrollbar on the message-drawer.
---
 .../templates/message_drawer_view_conversation_body.mustache    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/message/templates/message_drawer_view_conversation_body.mustache b/message/templates/message_drawer_view_conversation_body.mustache
index 4407c28e14f..222b0269c63 100644
--- a/message/templates/message_drawer_view_conversation_body.mustache
+++ b/message/templates/message_drawer_view_conversation_body.mustache
@@ -43,7 +43,7 @@
     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="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="content-message-container hidden h-100 px-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="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>

From 57ec34a9ccb9b5de4265caaf11efdbb4c1e8b4df Mon Sep 17 00:00:00 2001
From: Bas Brands <bas@moodle.com>
Date: Wed, 10 Apr 2019 10:43:48 +0200
Subject: [PATCH 3/3] MDL-64267 core_message: sticky positioning of contact
 request info

---
 .../templates/message_drawer_view_conversation_body.mustache   | 2 +-
 theme/bootstrapbase/less/moodle/bs4-compat.less                | 3 +++
 theme/bootstrapbase/style/moodle.css                           | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/message/templates/message_drawer_view_conversation_body.mustache b/message/templates/message_drawer_view_conversation_body.mustache
index 222b0269c63..9122259e6ad 100644
--- a/message/templates/message_drawer_view_conversation_body.mustache
+++ b/message/templates/message_drawer_view_conversation_body.mustache
@@ -44,7 +44,7 @@
 >
     <div class="position-relative h-100" data-region="content-container" style="overflow-y: auto; overflow-x: hidden">
         <div class="content-message-container hidden h-100 px-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="contact-request-sent-message-container">
+            <div class="py-3 bg-light position-sticky border-bottom text-center hidden" data-region="contact-request-sent-message-container" style="top: 0">
                 <p class="m-0">{{#str}} contactrequestsent, core_message {{/str}}</p>
                 <p class="font-italic font-weight-light" data-region="text"></p>
             </div>
diff --git a/theme/bootstrapbase/less/moodle/bs4-compat.less b/theme/bootstrapbase/less/moodle/bs4-compat.less
index d34c15c6fbe..89863906bd3 100644
--- a/theme/bootstrapbase/less/moodle/bs4-compat.less
+++ b/theme/bootstrapbase/less/moodle/bs4-compat.less
@@ -562,6 +562,9 @@
 .position-relative {
     position: relative !important;
 }
+.position-sticky {
+    position: sticky !important;
+}
 .align-self-start {
     align-self: flex-start !important;
 }
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index e15322175aa..44104ea2949 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -22338,6 +22338,9 @@ ul.indented-list {
 .position-relative {
   position: relative !important;
 }
+.position-sticky {
+  position: sticky !important;
+}
 .align-self-start {
   align-self: flex-start !important;
 }