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

pull/1/head
yflory 4 years ago
commit 0aea86b7bb

@ -254,10 +254,6 @@ button:not(.btn).primary:hover{
background-color: rgb(52, 118, 162); background-color: rgb(52, 118, 162);
} }
nav {
text-align: right;
}
*/}).toString().slice(14, -3); */}).toString().slice(14, -3);
var urlArgs = window.location.href.replace(/^.*\?([^\?]*)$/, function (all, x) { return x; }); var urlArgs = window.location.href.replace(/^.*\?([^\?]*)$/, function (all, x) { return x; });
var elem = document.createElement('div'); var elem = document.createElement('div');

@ -2552,7 +2552,9 @@ define([
var block = h('div#cp-loading-burn-after-reading', [ var block = h('div#cp-loading-burn-after-reading', [
info, info,
h('nav', button), h('nav', {
style: 'text-align: right'
}, button),
]); ]);
UI.errorLoadingScreen(block); UI.errorLoadingScreen(block);
}; };

Loading…
Cancel
Save