From 0dc138d47c242f3271a294c36d34aee083016288 Mon Sep 17 00:00:00 2001
From: Mary Evans <lazydaisy@visible-expression.co.uk>
Date: Thu, 21 Aug 2014 11:23:27 +0100
Subject: [PATCH] MDL-46812 grade/report/grader: Need to tie up loose ends in
 Gradebook after MDL-43824

Squashed commit of the following:

commit 4ae57a823ba6fa1d627d2bad296cdf905b1930ee
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 21 02:05:35 2014 +0100

    MDL-46812 grade/report/grader: Reset previous commit for left scroller.

commit 7e3d27d3cc9d22ffe8e1dbb54eb705a65153a6b0
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 21 01:23:09 2014 +0100

    MDL-46812 grade/report/grader: Added jsenabled css body class to rtl style.

commit 0b5c3341b79c4b4bfefcd82eef1940964448ccba
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 21 01:13:34 2014 +0100

    MDL-46812 theme_base: Removed more redundant CSS.

commit 8c44e8a4c644a9139d1750af498bed6a14decf5c
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Wed Aug 20 15:44:42 2014 +0100

    MDL-46812 theme_base: Removed redundent grade/report/grader CSS in style/grade.css

commit 7c69b546fab03163d3863044ab9d1d9130c1cdd9
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 14 12:50:14 2014 +0100

    MDL-46812 grade/report/grader: Need to tie up loose ends in Gradebook after MDL-43824

        1. fixed gradebook layout when JS is disabled
        2. added height and background color to scroller when JS is enabled
        3. removed redundent top margin in user-grades table
---
 grade/report/grader/styles.css | 39 ++++++++++++++++++++--------------
 theme/base/style/grade.css     | 12 -----------
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/grade/report/grader/styles.css b/grade/report/grader/styles.css
index f5e42960443..a1159e2451d 100644
--- a/grade/report/grader/styles.css
+++ b/grade/report/grader/styles.css
@@ -77,7 +77,7 @@ table#user-grades {
     background-color: transparent;
     border-style: solid;
     border-width: 1px;
-    margin: 20px 0 0;
+    margin: 0;
 }
 .path-grade-report-grader #overDiv table {
     margin: 0;
@@ -340,19 +340,18 @@ table#user-grades th.fixedcolumn {
     border-top: 1px solid #cecece;
     background-color: #fff;
 }
-.path-grade-report-grader .left_scroller {
-    float: left;
-    clear: none;
-    padding-top: 22px;
-}
-.path-grade-report-grader.dir-rtl .left_scroller {
-    float: right;
-}
 .path-grade-report-grader .right_scroller {
     width: auto;
     clear: none;
     overflow-x: scroll;
 }
+.path-grade-report-grader .left_scroller {
+    float: left;
+    clear: none;
+}
+.path-grade-report-grader.dir-rtl .left_scroller {
+    float: right;
+}
 .path-grade-report-grader table tr.avg,
 .path-grade-report-grader table tr.groupavg td,
 .path-grade-report-grader table tr.avg td,
@@ -617,13 +616,6 @@ table#user-grades th.category {
 .path-grade-report-grader .gradeparent {
     border-top: 1px solid #cecece;
 }
-#page-grade-report-grader-index .topscrollcontent {
-    background-color: #cecece;
-    height: 1px;
-}
-#page-grade-report-grader-index #user-grades {
-    margin-top: 4px;
-}
 .path-grade-report-grader div.left_scroller tr,
 .path-grade-report-grader div.right_scroller tr,
 .path-grade-report-grader div.left_scroller td,
@@ -635,3 +627,18 @@ table#user-grades th.category {
 .path-grade-report-grader td.grade.overridden {
     line-height: 20px;
 }
+
+/** MDL-46812 **/
+#page-grade-report-grader-index.jsenabled .right_scroller.topscroll {
+    background-color: #ececec;
+    height: 20px;
+    margin: 0;
+    padding: 0;
+}
+#page-grade-report-grader-index.jsenabled .topscrollcontent {
+    background-color: #ececec;
+    height: 20px;
+}
+.jsenabled.path-grade-report-grader .left_scroller {
+    border-top: 20px solid #ececec;
+}
diff --git a/theme/base/style/grade.css b/theme/base/style/grade.css
index e88099b9bf2..d5f096cd445 100644
--- a/theme/base/style/grade.css
+++ b/theme/base/style/grade.css
@@ -30,10 +30,6 @@
 .gradetreebox #gradetreesubmit {margin-bottom:1em;text-align: center;}
 .gradetreebox .hidden {display: none;}
 
-/*adjustments to grader report (with static student cols) to make things line up in IE and Safari*/
-#page-grade-report-grader-index .right_scroller #user-grades td {padding-top:0;padding-bottom:2px;}
-#page-grade-report-grader-index #fixed_column td {padding-top:0;padding-bottom:2px;}
-
 /** Advanced grading **/
 #page-grade-grading-manage #activemethodselector {text-align:center;margin-bottom:1em;}
 #page-grade-grading-manage #activemethodselector select {margin:0px 1em;}
@@ -76,11 +72,3 @@
 #page-grade-edit-outcome-course .courseoutcomes td {
     text-align:center;
 }
-
-#page-grade-report-grader-index .topscrollcontent {
-    height: 1px;
-}
-
-#page-grade-report-grader-index #user-grades {
-    margin-top: 4px;
-}