L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-67831-39' of git://github.com/bmbrands/moodle into MOODLE_39_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2020-08-05 00:47:33 +02:00
parent 9a642c49e1 9ffeab1ad1
commit f29c1bee74
4 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/templates/message_index.mustache
+1 -1
View File
@@ -43,7 +43,7 @@
>
<div class="container-fluid">
<div class="row-fluid h-100 no-gutters">
<div class="col-4 d-flex flex-column">
<div class="col-4 d-flex flex-column conversationcontainer">
<div class="border-right h-100">
<div class="panel-header-container" data-region="panel-header-container">
{{> core_message/message_drawer_view_overview_header }}
theme/boost/scss/moodle/message.scss
+16 -6
View File
@@ -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%;
}
}
}
}
theme/boost/style/moodle.css
+8 -1
View File
@@ -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 {
theme/classic/style/moodle.css
+8 -1
View File
@@ -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 {