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

Merge branch 'loading' into rebrand

Browse source
This commit is contained in:
yflory 2020-10-28 16:32:38 +01:00
commit 77d0a553df
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
customize.dist/loading.js
View file

@ -178,6 +178,7 @@ p.cp-password-info{
.cp-loading-progress { .cp-loading-progress {
width: 100%; width: 100%;
margin: 20px; margin: 20px;
text-align: center;
} }
.cp-loading-progress p { .cp-loading-progress p {
margin: 5px; margin: 5px;
@ -185,6 +186,10 @@ p.cp-password-info{
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.cp-loading-progress-list {
text-align: left;
display: inline-block;
}
.cp-loading-progress-list ul { .cp-loading-progress-list ul {
list-style: none; list-style: none;
padding-left: 0; padding-left: 0;
@ -200,7 +205,10 @@ p.cp-password-info{
width: 22px; width: 22px;
} }
.cp-loading-progress-list li span{ .cp-loading-progress-list li span{
margin-left: 20px; margin-left: 10px;
}
.cp-loading-progress-list li span.percent {
position: absolute;
} }
.cp-loading-progress-bar { .cp-loading-progress-bar {
@ -285,10 +293,12 @@ button.primary:hover{
var getLi = function (i) { var getLi = function (i) {
var check = (i < c || (i === c && data.progress >= 100)) ? 'fa-check-square-o' var check = (i < c || (i === c && data.progress >= 100)) ? 'fa-check-square-o'
: 'fa-square-o'; : 'fa-square-o';
var p = Math.min(Math.floor(data.progress), 100); var percentStr = '';
var percent = i < c ? '(100%)' : (i === c ? '('+p+'%)' : '(0%)'); if (i === c) {
return '<li><i class="fa '+check+'"></i><span>'+Messages['loading_state_'+i]+'</span>' + var p = Math.min(Math.floor(data.progress), 100);
'<span>'+percent+'</span>'; percentStr = '<span class="percent">('+p+'%)</span>';
}
return '<li><i class="fa '+check+'"></i><span>'+Messages['loading_state_'+i]+'</span>' + percentStr;
}; };
var list = '<ul>'; var list = '<ul>';
types.forEach(function (el, i) { types.forEach(function (el, i) {