L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-58349-32' of git://github.com/damyon/moodle into MOODLE_32_STABLE

Browse Source
This commit is contained in:
David Monllao
2017-04-20 15:20:46 +08:00
parent 1e15527fa5 21735b6075
commit e684411988
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/feedback/editpdf/styles.css
+13 -1
View File
@@ -153,7 +153,6 @@
}
.assignfeedback_editpdf_commentsearch ul li {
line-height: 0;
margin: 2px;
}
@@ -245,6 +244,19 @@
margin: 10px;
}
ul.assignfeedback_editpdf_search {
margin: 0;
}
.assignfeedback_editpdf_search li {
list-style-type: none;
}
.assignfeedback_editpdf_search li a {
text-decoration: none;
color: #555;
}
.assignfeedback_editpdf_menu li:hover,
.assignfeedback_editpdf_menu li:hover a,
.assignfeedback_editpdf_menu li a:hover {
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
Vendored
+1 -1
View File
@@ -2247,7 +2247,7 @@ Y.extend(COMMENTSEARCH, M.core.dialogue, {
placeholder = M.util.get_string('filter', 'assignfeedback_editpdf');
commentfilter = Y.Node.create('<input type="text" size="20" placeholder="' + placeholder + '"/>');
container.append(commentfilter);
commentlist = Y.Node.create('<ul role="menu" class="assignfeedback_editpdf_menu"/>');
commentlist = Y.Node.create('<ul role="menu" class="assignfeedback_editpdf_search"/>');
container.append(commentlist);
commentfilter.on('keyup', this.filter_search_comments, this);
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
Vendored
+1 -1
View File
@@ -2247,7 +2247,7 @@ Y.extend(COMMENTSEARCH, M.core.dialogue, {
placeholder = M.util.get_string('filter', 'assignfeedback_editpdf');
commentfilter = Y.Node.create('<input type="text" size="20" placeholder="' + placeholder + '"/>');
container.append(commentfilter);
commentlist = Y.Node.create('<ul role="menu" class="assignfeedback_editpdf_menu"/>');
commentlist = Y.Node.create('<ul role="menu" class="assignfeedback_editpdf_search"/>');
container.append(commentlist);
commentfilter.on('keyup', this.filter_search_comments, this);
mod/assign/feedback/editpdf/yui/src/editor/js/commentsearch.js
Vendored
+1 -1
View File
@@ -51,7 +51,7 @@ Y.extend(COMMENTSEARCH, M.core.dialogue, {
placeholder = M.util.get_string('filter', 'assignfeedback_editpdf');
commentfilter = Y.Node.create('<input type="text" size="20" placeholder="' + placeholder + '"/>');
container.append(commentfilter);
commentlist = Y.Node.create('<ul role="menu" class="assignfeedback_editpdf_menu"/>');
commentlist = Y.Node.create('<ul role="menu" class="assignfeedback_editpdf_search"/>');
container.append(commentlist);
commentfilter.on('keyup', this.filter_search_comments, this);