Merge branch 'MDL-57095-master' of git://github.com/ryanwyllie/moodle

This commit is contained in:
David Monllao 2016-11-30 09:26:07 +08:00
commit 449b730e09
3 changed files with 6 additions and 6 deletions

View File

@ -970,7 +970,7 @@
}
}
.content {
> .content {
height: 500px;
@media (max-height: 670px) {
height: 400px;

View File

@ -956,7 +956,7 @@
}
}
.content {
> .content {
height: 500px;
@media (max-height: 670px) {
height: 400px;

View File

@ -6561,7 +6561,7 @@ a.ygtvspacer:hover {
.notification-area .content-area .header:empty {
display: none;
}
.notification-area .content-area .content {
.notification-area .content-area > .content {
height: 500px;
box-sizing: border-box;
overflow: auto;
@ -6569,14 +6569,14 @@ a.ygtvspacer:hover {
padding: 15px;
}
@media (max-height: 670px) {
.notification-area .content-area .content {
.notification-area .content-area > .content {
height: 400px;
}
}
.notification-area .content-area .content:empty {
.notification-area .content-area > .content:empty {
display: none;
}
.notification-area .content-area .content:empty + .empty-text {
.notification-area .content-area > .content:empty + .empty-text {
display: block;
text-align: center;
padding-top: 100px;