The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'loading-screen' into 2025.9-test

Browse Source
This commit is contained in:
yflory 2025-10-09 15:34:59 +02:00
commit baebf1cae8
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
customize.dist/src/less2/include/loading.less
View File

@ -86,6 +86,13 @@
margin-bottom: 2em;
}
&.cp-loading-empty {
&>:not(.cp-loading-empty) {
display: none !important;
}
justify-content: center;
}
@media screen and (max-width: 500px) {
font-size: 16px !important;
}

4
www/common/common-interface.js
View File

@ -1067,6 +1067,7 @@ define([
var $loading = $('#' + LOADING);
// Show the loading screen
$loading.css('display', '');
$loading.toggleClass('cp-loading-empty', false);
$loading.removeClass('cp-loading-hidden');
$loading.removeClass('cp-loading-transparent');
$loading.attr('aria-live','polite');
@ -1122,9 +1123,10 @@ define([
UI.emptyLoadingScreen = function (content) {
UI.addLoadingScreen();
var $loading = $('#' + LOADING);
$loading.toggleClass('cp-loading-empty', true);
$loading.find('.cp-loading-container').hide();
$loading.find('.cp-loading-logo').hide();
$loading.append(content);
$loading.append(h('div.cp-loading-empty', [content]));
};
UI.errorLoadingScreen = function (error, transparent, exitable, errorCls) {
if (error === 'Error: XDR encoding failure') {