Merge branch 'MDL-52138-master-take4' of git://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 27 May 2020 06:24:51 +0000 (14:24 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 27 May 2020 06:24:51 +0000 (14:24 +0800)
grade/report/grader/lib.php
grade/report/grader/styles.css
theme/boost/scss/moodle/grade.scss
theme/boost/style/moodle.css
theme/classic/style/moodle.css

index 53741c4..5227baf 100644 (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';
index 3e54686..92d658e 100644 (file)
     white-space: nowrap;
 }
 
-/**
- * Stripped table.
- */
-.path-grade-report-grader .gradeparent tr:nth-of-type(even) .cell {
-    background-color: #f9f9f9;
-}
-
 /**
  * All the floating divs.
  */
     text-align: left;
 }
 
-/**
- * All the floating cells.
- */
-.path-grade-report-grader .gradeparent .floater .cell {
-    background-color: #f9f9f9;
-}
-
 /**
  * The user cells.
  */
     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;
 }
index 0281eca..04d6f61 100644 (file)
             @include border-radius($border-radius);
         }
 
-        tr .cell {
+        tr .cell,
+        .floater .cell {
             background-color: $pagination-bg;
         }
 
             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;
         }
 
index 5e730e0..1da1200 100644 (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 {
index 5ebcc18..2b0e59e 100644 (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 {