infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix UI issues

pull/1/head
yflory 2019-09-03 16:40:09 +02:00
parent c64adea8ff
commit e15b57989b
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
customize.dist/src/less2/include/alertify.less
View File

@ -462,6 +462,10 @@
}
}
margin-bottom: 15px;
&:empty {
margin: 0;
display: none;
}
}
.cp-share-friend {
width: 70px;
@ -493,6 +497,11 @@
visibility: hidden;
}
}
.cp-ownership {
& > label {
font-weight: bold;
}
}
}
}

7
www/common/common-ui-elements.js
View File

@ -103,8 +103,8 @@ define([
var redrawAll = function () {};
var div1 = h('div.cp-share-friends.cp-share-column');
var div2 = h('div.cp-share-friends.cp-share-column');
var div1 = h('div.cp-share-friends.cp-share-column.cp-ownership');
var div2 = h('div.cp-share-friends.cp-share-column.cp-ownership');
var $div1 = $(div1);
var $div2 = $(div2);
@ -139,7 +139,6 @@ define([
friends: _owners,
noFilter: true
}, function () {
console.log(arguments);
});
var $div = $(removeCol.div);
var others1 = removeCol.others;
@ -162,6 +161,7 @@ define([
// Check selection
var $sel = $div.find('.cp-share-friend.cp-selected');
var sel = $sel.toArray();
if (!sel.length) { return; }
var me = false;
var toRemove = sel.map(function (el) {
var ed = $(el).attr('data-ed');
@ -256,6 +256,7 @@ define([
$(addButton).click(function () {
// Check selection
var $sel = $div2.find('.cp-share-friend.cp-selected');
if (!sel.length) { return; }
var sel = $sel.toArray();
var toAdd = sel.map(function (el) {
return friends[$(el).attr('data-curve')].edPublic;