Merge branch 'wip-MDL-39741-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Sam Hemelryk
2013-07-01 13:17:48 +12:00
5 changed files with 6 additions and 12 deletions
+1 -1
View File
@@ -857,7 +857,7 @@ class grade_report_grader extends grade_report {
$itemcell->attributes['class'] = $type . ' ' . $catlevel . ' highlightable';
if ($element['object']->is_hidden()) {
$itemcell->attributes['class'] .= ' hidden';
$itemcell->attributes['class'] .= ' dimmed_text';
}
$itemcell->colspan = $colspan;
-5
View File
@@ -201,11 +201,6 @@ margin-left: 10px;
text-align:right;
}
table#user-grades .hidden,
table#user-grades .hidden a {
color:#aaa;
}
table#user-grades .datesubmitted {
font-size:.7em;
}
@@ -346,11 +346,6 @@ table#user-grades .quickfeedback {
text-align:right;
}
table#user-grades .hidden,
table#user-grades .hidden a {
.muted
}
table#user-grades .datesubmitted {
font-size: @fontSizeMini;
}
File diff suppressed because one or more lines are too long
+4
View File
@@ -934,6 +934,10 @@ table#user-grades {
border-width: 0px;
font-size: inherit;
}
table#user-grades .dimmed_text,
table#user-grades .dimmed_text a {
color: #AAAAAA;
}
table.user-grade td.oddd1.b1t.b2b.b1l{
width: 0px;
}