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

This commit is contained in:
yflory 2020-12-14 14:53:46 +01:00
commit 0aea86b7bb
2 changed files with 3 additions and 5 deletions

View File

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

View File

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