Merge branch 'MDL-56025-master' of git://github.com/damyon/moodle

This commit is contained in:
Andrew Nicols 2016-11-07 15:09:47 +08:00
commit 09b7cfc559
5 changed files with 94 additions and 1 deletions

View file

@ -53,6 +53,9 @@
.contacts-area {
border-right: 1px solid #e3e3e3;
height: 600px;
@media (max-height: 670px) {
height: 500px;
}
width: 280px;
display: inline-block;
box-sizing: border-box;
@ -148,6 +151,9 @@
.contacts {
height: 500px;
@media (max-height: 670px) {
height: 400px;
}
overflow-y: auto;
-webkit-overflow-scrolling: touch;
@ -284,6 +290,9 @@
.messages-area {
width: calc(100% - 280px);
height: 600px;
@media (max-height: 670px) {
height: 500px;
}
box-sizing: border-box;
margin: 0;
position: relative;
@ -324,6 +333,9 @@
padding: 30px;
font-size: 16px;
height: 600px;
@media (max-height: 670px) {
height: 500px;
}
box-sizing: border-box;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
@ -440,6 +452,9 @@
.messages {
height: 500px;
@media (max-height: 670px) {
height: 400px;
}
overflow-y: auto;
overflow-x: hidden;
-webkit-overflow-scrolling: touch;
@ -851,6 +866,9 @@
.notification-area {
height: 600px;
@media (max-height: 670px) {
height: 500px;
}
box-sizing: border-box;
border-radius: 4px;
margin-bottom: 30px;
@ -950,6 +968,9 @@
.content {
height: 500px;
@media (max-height: 670px) {
height: 400px;
}
box-sizing: border-box;
overflow: auto;
-webkit-overflow-scrolling: touch;
@ -992,6 +1013,9 @@
position: relative;
overflow: hidden;
height: 600px;
@media (max-height: 670px) {
height: 500px;
}
.messages-area {
.messages-header {