web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sure the tip is always visible when the loading screen is removed

Browse Source
This commit is contained in:
yflory
2017-03-14 12:49:22 +01:00
parent bc35fc86cf
commit f10149db1c
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
customize.dist/main.css
View File

@@ -397,6 +397,7 @@
font-family: lato, Helvetica, sans-serif; font-family: lato, Helvetica, sans-serif;
padding: 15px; padding: 15px;
max-width: 60%; max-width: 60%;
display: inline-block;
} }
/* The container <div> - needed to position the dropdown content */ /* The container <div> - needed to position the dropdown content */
.dropdown-bar { .dropdown-bar {

1
customize.dist/src/less/loading.less
View File

@@ -45,5 +45,6 @@
font-family: lato, Helvetica, sans-serif; font-family: lato, Helvetica, sans-serif;
padding: 15px; padding: 15px;
max-width: 60%; max-width: 60%;
display: inline-block;
} }
} }

3
www/common/cryptpad-common.js
View File

@@ -911,9 +911,10 @@ define([
}; };
common.removeLoadingScreen = function (cb) { common.removeLoadingScreen = function (cb) {
$('#' + LOADING).fadeOut(750, cb); $('#' + LOADING).fadeOut(750, cb);
$('#loadingTip').css('top', '');
window.setTimeout(function () { window.setTimeout(function () {
$('#loadingTip').fadeOut(750); $('#loadingTip').fadeOut(750);
}, 2000); }, 3000);
}; };
common.errorLoadingScreen = function (error, transparent) { common.errorLoadingScreen = function (error, transparent) {
if (!$('#' + LOADING).is(':visible')) { common.addLoadingScreen(); } if (!$('#' + LOADING).is(':visible')) { common.addLoadingScreen(); }