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

This commit is contained in:
yflory
2017-03-02 18:16:20 +01:00
6 changed files with 11 additions and 5 deletions

View File

@@ -66,6 +66,7 @@ li {
.contextMenu {
display: none;
position: absolute;
z-index: 50;
}
.contextMenu li {
padding: 0;
@@ -248,6 +249,7 @@ span.fa-folder-open {
}
#content div.grid li input {
width: 100%;
margin-top: 5px;
}
#content div.grid li .fa {
display: block;

View File

@@ -95,6 +95,7 @@ li {
.contextMenu {
display: none;
position: absolute;
z-index: 50;
li {
padding: 0;
font-size: 16px;
@@ -293,6 +294,7 @@ span {
}
input {
width: 100%;
margin-top: 5px;
}
.fa {
display: block;

View File

@@ -1423,7 +1423,8 @@ define([
// Open the menu
$iframe.find('.contextMenu').css({
top: ($context.offset().top + 32) + 'px',
right: '0px'
right: '0px',
left: ''
});
$li.contextmenu();
});