L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-52138-master-take4' of git://github.com/lucaboesch/moodle

Browse Source
This commit is contained in:
Jake Dallimore
2020-05-27 14:24:51 +08:00
parent 0fbc2c11f5 543f36a5aa
commit 5a0d8a7eaf
5 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/report/grader/lib.php
+5 -1
View File
@@ -710,12 +710,16 @@ class grade_report_grader extends grade_report {
$rows = $this->get_left_icons_row($rows, $colspan);
$suspendedstring = null;
$usercount = 0;
foreach ($this->users as $userid => $user) {
$userrow = new html_table_row();
$userrow->id = 'fixed_user_'.$userid;
$userrow->attributes['class'] = ($usercount % 2) ? 'userrow even' : 'userrow odd';
$usercell = new html_table_cell();
$usercell->attributes['class'] = 'header user';
$usercell->attributes['class'] = ($usercount % 2) ? 'header user even' : 'header user odd';
$usercount++;
$usercell->header = true;
$usercell->scope = 'row';
grade/report/grader/styles.css
-19
View File
@@ -46,13 +46,6 @@
white-space: nowrap;
}
/**
* Stripped table.
*/
.path-grade-report-grader .gradeparent tr:nth-of-type(even) .cell {
background-color: #f9f9f9;
}
/**
* All the floating divs.
*/
@@ -75,13 +68,6 @@
text-align: left;
}
/**
* All the floating cells.
*/
.path-grade-report-grader .gradeparent .floater .cell {
background-color: #f9f9f9;
}
/**
* The user cells.
*/
@@ -177,11 +163,6 @@
float: left;
}
.path-grade-report .gradeparent .floater .controls.cell,
.path-grade-report-grader .gradeparent .controls {
background-color: #f3ead8;
}
.path-grade-report-grader .gradeparent .category {
text-align: left;
}
theme/boost/scss/moodle/grade.scss
+7 -4
View File
@@ -386,7 +386,8 @@
@include border-radius($border-radius);
}
tr .cell {
tr .cell,
.floater .cell {
background-color: $pagination-bg;
}
@@ -395,9 +396,11 @@
border-color: $table-border-color;
}
tr:nth-of-type(even) .cell,
.floater .cell,
.avg {
.userrow.odd .cell,
.floater .cell.odd,
.heading .cell,
.cell.category,
.avg .cell {
background-color: $gray-lightest;
}
theme/boost/style/moodle.css
+7 -4
View File
@@ -18167,16 +18167,19 @@ p.arrow_button {
/**
* Grader report.
*/
.path-grade-report-grader .gradeparent tr .cell {
.path-grade-report-grader .gradeparent tr .cell,
.path-grade-report-grader .gradeparent .floater .cell {
background-color: #fff; }
.path-grade-report-grader .gradeparent table,
.path-grade-report-grader .gradeparent .cell {
border-color: #dee2e6; }
.path-grade-report-grader .gradeparent tr:nth-of-type(even) .cell,
.path-grade-report-grader .gradeparent .floater .cell,
.path-grade-report-grader .gradeparent .avg {
.path-grade-report-grader .gradeparent .userrow.odd .cell,
.path-grade-report-grader .gradeparent .floater .cell.odd,
.path-grade-report-grader .gradeparent .heading .cell,
.path-grade-report-grader .gradeparent .cell.category,
.path-grade-report-grader .gradeparent .avg .cell {
background-color: #f8f9fa; }
.path-grade-report-grader .gradeparent table .clickable {
theme/classic/style/moodle.css
+7 -4
View File
@@ -18401,16 +18401,19 @@ p.arrow_button {
.path-grade-report-grader .gradeparent table {
border-radius: 0.25rem; }
.path-grade-report-grader .gradeparent tr .cell {
.path-grade-report-grader .gradeparent tr .cell,
.path-grade-report-grader .gradeparent .floater .cell {
background-color: #fff; }
.path-grade-report-grader .gradeparent table,
.path-grade-report-grader .gradeparent .cell {
border-color: #dee2e6; }
.path-grade-report-grader .gradeparent tr:nth-of-type(even) .cell,
.path-grade-report-grader .gradeparent .floater .cell,
.path-grade-report-grader .gradeparent .avg {
.path-grade-report-grader .gradeparent .userrow.odd .cell,
.path-grade-report-grader .gradeparent .floater .cell.odd,
.path-grade-report-grader .gradeparent .heading .cell,
.path-grade-report-grader .gradeparent .cell.category,
.path-grade-report-grader .gradeparent .avg .cell {
background-color: #f8f9fa; }
.path-grade-report-grader .gradeparent table .clickable {