Merge branch 'wip-MDL-39299-master' of git://github.com/phalacee/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Damyon Wiese 2013-07-16 20:59:41 +08:00
commit e202521f25
2 changed files with 12 additions and 3 deletions

View File

@ -69,12 +69,18 @@
margin-left: 40%;
padding-left: 22px;
}
.section .activity.modtype_label.label {
font-weight: normal;
}
.section li.activity {
padding: .2em;
clear: both;
}
.section .activity .activityinstance .groupinglabel {
padding-left: .45em;
padding-left: 30px;
}
.dir-rtl .section .activity .activityinstance .groupinglabel {
padding-right: 30px;
}
.section .activity .availabilityinfo,
.section .activity .contentafterlink {
@ -209,7 +215,10 @@
text-align: right;
}
.path-course-view .unread {
margin-left: 3em;
margin-left: 30px;
}
.dir-rtl.path-course-view .unread {
margin-right: 30px;
}
.path-course-view .block.drag .header {
cursor: move;

File diff suppressed because one or more lines are too long