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

pull/1/head
yflory 4 years ago
commit 0506e717b8

@ -101,7 +101,7 @@ define([
var url = APP.origin + '/profile/#' + hash; var url = APP.origin + '/profile/#' + hash;
$('<button>', { $('<button>', {
'class': 'btn btn-primary '+VIEW_PROFILE_BUTTON, 'class': 'btn '+VIEW_PROFILE_BUTTON,
}).text(Messages.profile_viewMyProfile).click(function () { }).text(Messages.profile_viewMyProfile).click(function () {
window.open(url, '_blank'); window.open(url, '_blank');
}).appendTo($container); }).appendTo($container);
@ -136,7 +136,7 @@ define([
APP.$linkEdit = $(); APP.$linkEdit = $();
if (APP.readOnly) { return; } if (APP.readOnly) { return; }
var button = h('button.btn.btn-primary', { var button = h('button.btn', {
title: Messages.clickToEdit title: Messages.clickToEdit
}, Messages.profile_addLink); }, Messages.profile_addLink);
APP.$linkEdit = $(button); APP.$linkEdit = $(button);
@ -494,7 +494,7 @@ define([
var $div = $(h('div.cp-sidebarlayout-element')).appendTo($container); var $div = $(h('div.cp-sidebarlayout-element')).appendTo($container);
APP.$edPublic = $('<button>', { APP.$edPublic = $('<button>', {
'class': 'btn btn-success', 'class': 'btn',
}).append(h('i.fa.fa-key')) }).append(h('i.fa.fa-key'))
.append(h('span', Messages.profile_copyKey)) .append(h('span', Messages.profile_copyKey))
.click(function () { .click(function () {

Loading…
Cancel
Save