Merge branch 'wip-MDL-50323-master' of git://github.com/abgreeve/moodle

This commit is contained in:
Dan Poltawski 2015-09-08 09:14:14 +01:00
commit 0c05ec3b96
4 changed files with 42 additions and 1 deletions

View File

@ -1315,6 +1315,10 @@ sup {vertical-align: super;}
.course-content ul.weeks .content .summary ul,
.course-content ul.topics .content .summary ul {list-style: disc outside none;}
.course-content ul.weeks .content .summary ul ul,
.course-content ul.topics .content .summary ul ul {list-style: circle outside none;}
.course-content ul.weeks .content .summary ul ul ul,
.course-content ul.topics .content .summary ul ul ul {list-style: square outside none;}
.course-content ul.weeks .content .summary ol,
.course-content ul.topics .content .summary ol {list-style: decimal outside none;}

View File

@ -66,6 +66,16 @@
right: auto;
}
.course-content li.section li.activity ul {
list-style: disc;
}
.course-content li.section li.activity ul ul {
list-style: circle;
}
.course-content li.section li.activity ul ul ul {
list-style: square;
}
.sitetopic .section .activity .activityinstance div,
.course-content .section .activity .activityinstance div { display: inline;}
.course-content .section .activity .activityinstance form { display: inline;}

View File

@ -344,6 +344,33 @@
margin-left: 25px;
}
.course-content li {
&.section {
ul {
list-style: disc;
ul {
list-style: circle;
ul {
list-style: square;
}
}
}
li {
&.activity {
ul {
list-style: disc;
ul {
list-style: circle;
ul {
list-style: square;
}
}
}
}
}
}
}
.path-course-view .completionprogress {
margin-left: 25px
}

File diff suppressed because one or more lines are too long