diff --git a/customize.dist/main.css b/customize.dist/main.css index 127a2756b..3d7ed6a58 100644 --- a/customize.dist/main.css +++ b/customize.dist/main.css @@ -397,6 +397,7 @@ font-family: lato, Helvetica, sans-serif; padding: 15px; max-width: 60%; + display: inline-block; } /* The container
- needed to position the dropdown content */ .dropdown-bar { diff --git a/customize.dist/src/less/loading.less b/customize.dist/src/less/loading.less index 28886066a..b48045622 100644 --- a/customize.dist/src/less/loading.less +++ b/customize.dist/src/less/loading.less @@ -45,5 +45,6 @@ font-family: lato, Helvetica, sans-serif; padding: 15px; max-width: 60%; + display: inline-block; } } diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js index 3cdb1c906..190b05508 100644 --- a/www/common/cryptpad-common.js +++ b/www/common/cryptpad-common.js @@ -911,9 +911,10 @@ define([ }; common.removeLoadingScreen = function (cb) { $('#' + LOADING).fadeOut(750, cb); + $('#loadingTip').css('top', ''); window.setTimeout(function () { $('#loadingTip').fadeOut(750); - }, 2000); + }, 3000); }; common.errorLoadingScreen = function (error, transparent) { if (!$('#' + LOADING).is(':visible')) { common.addLoadingScreen(); }