mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 05:25:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-63674-master' of git://github.com/rezaies/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2019-02-27 13:01:08 +08:00
commit ccf03e1398
8 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
message/templates/message_drawer_view_conversation_body_message.mustache
View File

@ -66,5 +66,5 @@
<span class="hidden ml-2 small text-dark" data-region="not-selected-icon">{{#pix}} i/uncheckedcircle, core {{/pix}}</span>
<span class="hidden ml-2 small text-primary" data-region="selected-icon">{{#pix}} i/checkedcircle, core {{/pix}}</span>
</div>
<div>{{{text}}}</div>
<div dir="auto" align="initial">{{{text}}}</div>
</div>

1
message/templates/message_drawer_view_conversation_footer_content.mustache
View File

@ -37,6 +37,7 @@
<div class="d-flex mt-1">
<textarea
dir="auto"
data-region="send-message-txt"
class="form-control bg-light"
rows="3"

4
theme/boost/scss/moodle/message.scss
View File

@ -469,6 +469,10 @@ $message-drawer-width: 320px;
.footer-container {
flex-shrink: 0;
overflow-x: hidden;
textarea {
direction: ltr;
}
}
.matchtext {

2
theme/boost/style/moodle.css
View File

@ -13655,6 +13655,8 @@ a.ygtvspacer:hover {
.message-app .footer-container {
flex-shrink: 0;
overflow-x: hidden; }
.message-app .footer-container textarea {
direction: ltr; }
.message-app .matchtext {
background-color: #b5d9f9;
color: #373a3c;

10
theme/bootstrapbase/less/moodle/message.less
View File

@ -484,6 +484,10 @@
.footer-container {
flex-shrink: 0;
overflow-x: hidden;
textarea {
direction: ltr;
}
}
.matchtext {
@ -604,6 +608,12 @@
}
}
.dir-rtl {
.message-drawer {
box-shadow: 2px 2px 4px rgba(0, 0, 0, .08);
}
}
@media (max-width: 480px) {
.messaging-area-container {
.messaging-area {

6
theme/bootstrapbase/style/moodle.css
View File

@ -8555,6 +8555,9 @@ a.ygtvspacer:hover {
flex-shrink: 0;
overflow-x: hidden;
}
.message-app .footer-container textarea {
direction: ltr;
}
.message-app .matchtext {
background-color: #ade6fe;
color: #333;
@ -8644,6 +8647,9 @@ a.ygtvspacer:hover {
.message-app .lazy-load-list {
overflow-y: auto;
}
.dir-rtl .message-drawer {
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.08);
}
@media (max-width: 480px) {
.messaging-area-container .messaging-area .messages-area.editing .messages-header {
height: 80px;

2
theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache
View File

@ -70,5 +70,5 @@
<span class="hidden ml-2 small text-primary" data-region="not-selected-icon">{{#pix}} i/uncheckedcircle, core {{/pix}}</span>
<span class="hidden ml-2 small text-primary" data-region="selected-icon">{{#pix}} i/checkedcircle, core {{/pix}}</span>
</div>
<div>{{{text}}}</div>
<div dir="auto" align="initial">{{{text}}}</div>
</div>

1
theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_footer_content.mustache
View File

@ -40,6 +40,7 @@
<div class="d-flex mt-1">
<textarea
dir="auto"
data-region="send-message-txt"
class="form-control bg-light m-0 flex-grow"
rows="3"