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

Merge branch 'MDL-64267-36' of git://github.com/bmbrands/moodle into MOODLE_36_STABLE

Browse Source
This commit is contained in:
Jake Dallimore
2019-04-24 16:55:19 +08:00
parent ea210f78e4 57ec34a9cc
commit 09d7853909
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/templates/message_drawer_view_conversation_body.mustache
+5 -5
View File
@@ -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="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="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>
<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);">
theme/bootstrapbase/less/moodle/bs4-compat.less
+3
View File
@@ -562,6 +562,9 @@
.position-relative {
position: relative !important;
}
.position-sticky {
position: sticky !important;
}
.align-self-start {
align-self: flex-start !important;
}
theme/bootstrapbase/style/moodle.css
+3
View File
@@ -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;
}