Merge branch 'wip-MDL-46812_master' of git://github.com/lazydaisy/moodle

This commit is contained in:
Damyon Wiese
2014-08-25 14:03:00 +08:00
2 changed files with 16 additions and 21 deletions
+16 -9
View File
@@ -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;
@@ -343,7 +343,6 @@ table#user-grades th.fixedcolumn {
.path-grade-report-grader .left_scroller {
float: left;
clear: none;
padding-top: 22px;
}
.path-grade-report-grader.dir-rtl .left_scroller {
float: right;
@@ -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;
}
-12
View File
@@ -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;
}