Merge branch 'MDL-64375-master' of git://github.com/damyon/moodle

This commit is contained in:
Jake Dallimore 2019-01-09 15:33:09 +08:00
commit 111dfd2db5
2 changed files with 8 additions and 5 deletions

View file

@ -64,10 +64,7 @@
} }
.gradingform_rubric { .gradingform_rubric {
overflow: auto;
padding-bottom: 1.5em; padding-bottom: 1.5em;
max-width: 720px;
position: relative;
} }
.gradingform_rubric.editor .criterion .controls, .gradingform_rubric.editor .criterion .controls,
@ -89,6 +86,9 @@
.gradingform_rubric .criteria { .gradingform_rubric .criteria {
height: 100%; height: 100%;
display: flex;
width: 100%;
overflow: auto;
} }
.gradingform_rubric .criterion { .gradingform_rubric .criterion {
@ -307,4 +307,4 @@
margin: 0; margin: 0;
position: relative; position: relative;
float: right; float: right;
} }

View file

@ -760,8 +760,11 @@
/***** Start rubric *****/ /***** Start rubric *****/
.path-mod-assign [data-region="grade-panel"] .gradingform_rubric { .path-mod-assign [data-region="grade-panel"] .gradingform_rubric {
max-width: 100%;
padding-bottom: 0; padding-bottom: 0;
max-width: none; }
.path-mod-assign .gradingform_rubric {
max-width: calc(100vw - 200px);
} }
.path-mod-assign [data-region="grade-panel"] .gradingform_rubric .criterion .description { .path-mod-assign [data-region="grade-panel"] .gradingform_rubric .criterion .description {