From 7aee6e2fb2be75d8a461f81d7f27edadc2b42f84 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Mon, 8 Feb 2021 23:42:22 +0000
Subject: [PATCH] MDL-69883 message: fix lazy loading of conversations.

Set max-height on each container section rather than the container
itself, so that each can respond to the scrollBottom event within
the lazy loading module (which handles the overflow itself).
---
 theme/boost/scss/moodle/message.scss | 5 +++--
 theme/boost/style/moodle.css         | 5 ++---
 theme/classic/style/moodle.css       | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/theme/boost/scss/moodle/message.scss b/theme/boost/scss/moodle/message.scss
index fff7cd4b5ad..593673ac091 100644
--- a/theme/boost/scss/moodle/message.scss
+++ b/theme/boost/scss/moodle/message.scss
@@ -659,8 +659,9 @@ $message-day-color: color-yiq($message-app-bg) !default;
         height: 100%;
         margin-top: 0;
         .conversationcontainer {
-            max-height: calc(100vh - 50px);
-            overflow: auto;
+            .section {
+                max-height: calc(100vh - 50px);
+            }
         }
         div[role="main"] {
             height: 100%;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 076e9532536..e82d687ead8 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -15468,9 +15468,8 @@ a.ygtvspacer:hover {
 #page-message-index #region-main {
   height: 100%;
   margin-top: 0; }
-  #page-message-index #region-main .conversationcontainer {
-    max-height: calc(100vh - 50px);
-    overflow: auto; }
+  #page-message-index #region-main .conversationcontainer .section {
+    max-height: calc(100vh - 50px); }
   #page-message-index #region-main div[role="main"] {
     height: 100%; }
     #page-message-index #region-main div[role="main"] #maincontent {
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 60e19a260f9..0d76b3e3888 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -15684,9 +15684,8 @@ a.ygtvspacer:hover {
 #page-message-index #region-main {
   height: 100%;
   margin-top: 0; }
-  #page-message-index #region-main .conversationcontainer {
-    max-height: calc(100vh - 50px);
-    overflow: auto; }
+  #page-message-index #region-main .conversationcontainer .section {
+    max-height: calc(100vh - 50px); }
   #page-message-index #region-main div[role="main"] {
     height: 100%; }
     #page-message-index #region-main div[role="main"] #maincontent {