Merge branch 'MDL-53004-master' of https://github.com/lucaboesch/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 28 Nov 2017 05:18:03 +0000 (13:18 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 28 Nov 2017 05:18:03 +0000 (13:18 +0800)
Conflicts:
mod/assign/styles.css

1  2 
mod/assign/styles.css

      padding: 0;
  }
  
- .path-mod-assign .gradingbatchoperationsform .mform fieldset {
-     margin: 0;
-     padding: 0;
- }
 +.path-mod-assign textarea.quickgrade {
 +    resize: both;
 +}
 +
  .path-mod-assign td.submissionstatus,
  .path-mod-assign div.submissionstatus,
  .path-mod-assign a:link.submissionstatus {