blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

address XXX issues

Browse source
This commit is contained in:
David Benqué 2019-11-22 11:34:13 +00:00
parent e2b3cf3ccc
commit 57ba4e0bcd
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
customize.dist/src/less2/include/alertify.less
View file

@ -24,7 +24,7 @@
@alertify-input-bg: @colortheme_modal-input;
@alertify-input-fg: @colortheme_modal-input-fg;
@alertify_padding-base: @variables_padding; // XXX to align tab contents with buttons. could change @variables-padding: 12px
@alertify_padding-base: @variables_padding;
@alertify_box-shadow: @variables_shadow;
// Logs to show that something has happened
@ -349,7 +349,7 @@
padding: @alertify_padding-base;
text-align: right;
button{
margin:0px !important; // XXX was not overriding the button margin
margin:0px !important;
&:not(:last-child) {
margin-right: @alertify_padding-base !important;
}

2
www/common/common-ui-elements.js
View file

@ -1142,7 +1142,7 @@ define([
var hasFriends = Object.keys(config.friends || {}).length !== 0;
var onFriendShare = Util.mkEvent();
var friendsObject = hasFriends ? createShareWithFriends(config, onFriendShare, getLinkValue) : {
content: h('p', Messages.share_noContacts),
content: h('p', Messages.team_noFriend),
button: {}
};
var friendsList = friendsObject.content;

3
www/common/translations/messages.json
View file

@ -988,7 +988,6 @@
"share_linkOpen": "Preview",
"share_linkCopy": "Copy",
"share_contactCategory": "Contacts",
"share_noContacts": "You do not have any contacts yet. // XXX",
"share_embedCategory": "Embed",
"share_mediatagCopy": "Copy mediatag to clipboard",
"loading_pad_1": "Initializing pad",
@ -1002,7 +1001,7 @@
"sharedFolders_create_name": "Folder name",
"sharedFolders_create_owned": "Owned folder",
"sharedFolders_create_password": "Folder password",
"sharedFolders_share": "Share this URL with other registered users to give them access to the shared folder. Once they open this URL, the shared folder will be added to the root directory of their CryptDrive. // XXX change/delete?",
"sharedFolders_share": "Share this link with other registered users to give them access to the shared folder. Once they open this link, the shared folder will be added to their CryptDrive.",
"convertFolderToSF_SFParent": "This folder cannot be converted to a shared folder in its current location. Move it outside of the containing shared folder to continue.",
"convertFolderToSF_SFChildren": "This folder cannot be converted to a shared folder because it already contains shared folders. Move those Shared folders elsewhere to continue.",
"convertFolderToSF_confirm": "This folder must be converted to a Shared folder for others to view it. Continue?",