moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-64524-35' of git://github.com/damyon/moodle into MOODLE_35_STABLE

Browse source
This commit is contained in:
Jun Pataleta 2019-04-01 13:46:34 +08:00
commit 3304b0728c
6 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
grade/grading/form/guide/styles.css
View file

@ -237,3 +237,7 @@
margin: 0;
width: auto;
}
.gradingform_guide_comment_chooser {
max-height: 80vh;
overflow-y: auto;
}

27
mod/assign/feedback/editpdf/styles.css
View file

@ -202,20 +202,21 @@
margin: 0;
}
.assignfeedback_editpdf_commentmenu li.quicklist_comment {
width: 150px;
.assignfeedback_editpdf_dropdown li.quicklist_comment {
width: 200px;
}
.assignfeedback_editpdf_commentmenu li.quicklist_comment a {
.assignfeedback_editpdf_dropdown li.quicklist_comment a {
white-space: nowrap;
display: inline-block;
max-width: 130px;
max-width: 140px;
overflow: hidden;
text-overflow: ellipsis;
}
.assignfeedback_editpdf_commentmenu a.delete_quicklist_comment {
.assignfeedback_editpdf_dropdown a.delete_quicklist_comment {
float: right;
width: 20px;
}
.assignfeedback_editpdf_dropdown button {
@ -238,7 +239,7 @@
margin-right: 0;
margin-top: 0;
border-radius: 4px;
width: 30px;
width: 200px;
}
.moodle-dialogue-base .moodle-dialogue.assignfeedback_editpdf_dropdown .moodle-dialogue-bd {
@ -257,7 +258,10 @@
.assignfeedback_editpdf_menu li a {
text-decoration: none;
color: #555;
margin: 10px;
margin-left: 10px;
margin-right: 10px;
margin-top: 4px;
margin-bottom: 4px;
}
ul.assignfeedback_editpdf_search {
@ -273,15 +277,16 @@ ul.assignfeedback_editpdf_search {
color: #555;
}
.assignfeedback_editpdf_menu li:hover,
.assignfeedback_editpdf_menu li:hover a,
.assignfeedback_editpdf_menu li a:hover {
.assignfeedback_editpdf_menu li:hover {
background-color: #ebebeb;
background-image: radial-gradient(ellipse at center, #fff 60%, #dfdfdf 100%);
}
ul.assignfeedback_editpdf_menu {
margin: 0;
min-width: 200px;
max-height: 40vh;
overflow-y: auto;
overflow-x: hidden;
}
.assignfeedback_editpdf_menu li {

1
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js vendored
View file

@ -2165,6 +2165,7 @@ Y.extend(COMMENTMENU, M.assignfeedback_editpdf.dropdown, {
'<img src="' + M.util.image_url('t/delete', 'core') + '" ' +
'alt="' + M.util.get_string('deletecomment', 'assignfeedback_editpdf') + '"/>' +
'</a>');
linkitem.setAttribute('title', quickcomment.rawtext);
listitem.append(linkitem);
listitem.append(deletelinkitem);

12
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js vendored
View file

File diff suppressed because one or more lines are too long

1
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js vendored
View file

@ -2165,6 +2165,7 @@ Y.extend(COMMENTMENU, M.assignfeedback_editpdf.dropdown, {
'<img src="' + M.util.image_url('t/delete', 'core') + '" ' +
'alt="' + M.util.get_string('deletecomment', 'assignfeedback_editpdf') + '"/>' +
'</a>');
linkitem.setAttribute('title', quickcomment.rawtext);
listitem.append(linkitem);
listitem.append(deletelinkitem);

1
mod/assign/feedback/editpdf/yui/src/editor/js/commentmenu.js vendored
View file

@ -98,6 +98,7 @@ Y.extend(COMMENTMENU, M.assignfeedback_editpdf.dropdown, {
'<img src="' + M.util.image_url('t/delete', 'core') + '" ' +
'alt="' + M.util.get_string('deletecomment', 'assignfeedback_editpdf') + '"/>' +
'</a>');
linkitem.setAttribute('title', quickcomment.rawtext);
listitem.append(linkitem);
listitem.append(deletelinkitem);