Merge branch 'MDL-62153-master' of git://github.com/bmbrands/moodle

This commit is contained in:
Jun Pataleta 2018-05-14 11:57:01 +08:00
commit cea21312f9
2 changed files with 18 additions and 2 deletions

View File

@ -281,7 +281,7 @@ if ($action === 'delete') {
$table->head = array();
$table->align = array('right', 'left');
$table->attributes['class'] = 'compacttable generaltable form-inline';
$table->attributes['class'] = 'generaltable';
if (empty($userstats->gradeinfo)) {
$table->align = array("center");
@ -307,7 +307,7 @@ if ($action === 'delete') {
foreach ($answerpages as $page) {
$table->align = array('left', 'left');
$table->size = array('70%', null);
$table->attributes['class'] = 'compacttable generaltable form-inline';
$table->attributes['class'] = 'generaltable';
unset($table->data);
if ($page->grayout) { // set the color of text
$fontstart = "<span class=\"dimmed\">";

View File

@ -237,9 +237,25 @@ div#dock {
.path-mod-lesson .answeroption .checkbox label p {
display: inline;
}
.path-mod-lesson .form-inline label.form-check-label {
display: inline-block;
}
#page-mod-lesson-view .branchbuttoncontainer .singlebutton button[type="submit"] {
white-space: normal;
}
.path-mod-lesson .generaltable td {
vertical-align: middle;
label {
margin-bottom: 0;
}
.highlight {
display: inline-block;
margin-left: 0.25rem;
}
input[type="checkbox"] {
display: block;
}
}
.path-mod-wiki .wiki_headingtitle,
.path-mod-wiki .midpad,