Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
ansuz
2017-02-02 18:37:09 +01:00
9 changed files with 21 additions and 23 deletions

View File

@@ -202,7 +202,7 @@ span.fa-folder-open {
float: right;
}
#content li:not(.header) *:not(input) {
pointer-events: none;
/*pointer-events: none;*/
}
#content li:not(.header):hover .name {
text-decoration: underline;

View File

@@ -244,7 +244,7 @@ span {
li {
&:not(.header) {
*:not(input) {
pointer-events: none;
/*pointer-events: none;*/
}
&:hover {
.name {

View File

@@ -300,10 +300,10 @@ define([
});
$input.on('keyup', function (e) {
if (e.which === 13) {
removeInput();
filesOp.renameElement(path, $input.val(), function () {
refresh();
});
removeInput();
}
});
//$element.parent().append($input);