From 9ffeab1ad186927f9581437fa6b326cd9763c850 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Thu, 7 May 2020 15:09:54 +0200 Subject: [PATCH] MDL-67831 core_message: use space available for message index page - the prevents the message reply box from being out of view when a user has many conversations. --- message/templates/message_index.mustache | 2 +- theme/boost/scss/moodle/message.scss | 22 ++++++++++++++++------ theme/boost/style/moodle.css | 9 ++++++++- theme/classic/style/moodle.css | 9 ++++++++- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/message/templates/message_index.mustache b/message/templates/message_index.mustache index f47b39c5946..33e3ab62a82 100644 --- a/message/templates/message_index.mustache +++ b/message/templates/message_index.mustache @@ -43,7 +43,7 @@ >
-
+
{{> core_message/message_drawer_view_overview_header }} diff --git a/theme/boost/scss/moodle/message.scss b/theme/boost/scss/moodle/message.scss index 8388761fda5..fff7cd4b5ad 100644 --- a/theme/boost/scss/moodle/message.scss +++ b/theme/boost/scss/moodle/message.scss @@ -651,15 +651,25 @@ $message-day-color: color-yiq($message-app-bg) !default; overflow-y: auto; } } -#page-message-index #region-main { - height: 100%; - div[role="main"] { +#page-message-index { + #page-header { + display: none; + } + #region-main { height: 100%; - #maincontent { - margin-top: -1px; + margin-top: 0; + .conversationcontainer { + max-height: calc(100vh - 50px); + overflow: auto; } - .message-app.main { + div[role="main"] { height: 100%; + #maincontent { + margin-top: -1px; + } + .message-app.main { + height: 100%; + } } } } diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 93f02cb4b81..6c5caddf828 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -15316,8 +15316,15 @@ a.ygtvspacer:hover { .message-app .lazy-load-list { overflow-y: auto; } +#page-message-index #page-header { + display: none; } + #page-message-index #region-main { - height: 100%; } + height: 100%; + margin-top: 0; } + #page-message-index #region-main .conversationcontainer { + max-height: calc(100vh - 50px); + overflow: auto; } #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 02d840a419a..82151de70bc 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -15534,8 +15534,15 @@ a.ygtvspacer:hover { .message-app .lazy-load-list { overflow-y: auto; } +#page-message-index #page-header { + display: none; } + #page-message-index #region-main { - height: 100%; } + height: 100%; + margin-top: 0; } + #page-message-index #region-main .conversationcontainer { + max-height: calc(100vh - 50px); + overflow: auto; } #page-message-index #region-main div[role="main"] { height: 100%; } #page-message-index #region-main div[role="main"] #maincontent {