Merge branch 'wip-MDL-47543-master' of git://github.com/marinaglancy/moodle

Conflicts: theme/bootstrapbase/less/moodle/grade.less theme/bootstrapbase/style/moodle.css
2014-10-08 15:49:58 +01:00
parent da88accb5f 9f1088d482
commit 66689366a0
18 changed files with 103 additions and 149 deletions
@@ -235,6 +235,15 @@
    text-align: center;
 }

+.path-grade-edit-tree table.setup-grades .column-weight {
+    white-space: nowrap;
+}
+
+.path-grade-edit-tree table.setup-grades .gradeitemdescription {
+    font-weight: normal;
+    font-style: italic;
+}
+
 /**
 * Grader report.
 */
@@ -253,4 +262,4 @@
            background-color: @tableBackgroundAccent;
        }
    }
-}
+ }