moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
mod/lesson/report.php
View file

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

16
theme/boost/scss/moodle/modules.scss
View file

@ -237,9 +237,25 @@ div#dock {
.path-mod-lesson .answeroption .checkbox label p { .path-mod-lesson .answeroption .checkbox label p {
display: inline; display: inline;
} }
.path-mod-lesson .form-inline label.form-check-label {
display: inline-block;
}
#page-mod-lesson-view .branchbuttoncontainer .singlebutton button[type="submit"] { #page-mod-lesson-view .branchbuttoncontainer .singlebutton button[type="submit"] {
white-space: normal; 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 .wiki_headingtitle,
.path-mod-wiki .midpad, .path-mod-wiki .midpad,