diff options
author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2015-04-15 14:42:45 +0200 |
---|---|---|
committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2015-04-15 14:42:45 +0200 |
commit | 14b92c3ce642f7ea177dbaf0953a6f6c8b12a7ca (patch) | |
tree | ce116901f1dfc5ec67b032d5db2d647461cd5cae /settings | |
parent | 75268860fcac2afd1c3a77d0a4ac58ef8db0e9c9 (diff) | |
parent | 04ca5b8160ad4442f385c6cacc47b269e8b57993 (diff) | |
download | nextcloud-server-14b92c3ce642f7ea177dbaf0953a6f6c8b12a7ca.tar.gz nextcloud-server-14b92c3ce642f7ea177dbaf0953a6f6c8b12a7ca.zip |
Merge pull request #15632 from owncloud/remove-tooltip-fade
remove slow fade animation for remaining tipsy tooltips
Diffstat (limited to 'settings')
-rw-r--r-- | settings/js/admin.js | 2 | ||||
-rw-r--r-- | settings/js/personal.js | 2 | ||||
-rw-r--r-- | settings/js/users/users.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/settings/js/admin.js b/settings/js/admin.js index 1e27c1be7e3..34f58db8688 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -39,7 +39,7 @@ $(document).ready(function(){ } ); }); - $('#backgroundjobs span.crondate').tipsy({fade: true, gravity: 's', live: true}); + $('#backgroundjobs span.crondate').tipsy({gravity: 's', live: true}); $('#backgroundjobs input').change(function(){ if($(this).attr('checked')){ diff --git a/settings/js/personal.js b/settings/js/personal.js index 43f328d2223..687b02399a7 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -304,7 +304,7 @@ $(document).ready(function () { return true; }); - $('#sslCertificate tr > td').tipsy({fade: true, gravity: 'n', live: true}); + $('#sslCertificate tr > td').tipsy({gravity: 'n', live: true}); $('#rootcert_import').fileupload({ done: function (e, data) { diff --git a/settings/js/users/users.js b/settings/js/users/users.js index a6aeb4ffb5c..5fd4e9d235b 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -643,7 +643,7 @@ $(document).ready(function () { if(isRestoreDisabled) { $tr.addClass('row-warning'); // add tipsy if the password change could cause data loss - no recovery enabled - $input.tipsy({gravity:'s', fade:false}); + $input.tipsy({gravity:'s'}); $input.attr('title', t('settings', 'Changing the password will result in data loss, because data recovery is not available for this user')); } $td.find('img').hide(); |