diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-09-21 19:46:29 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-09-23 18:18:14 +0200 |
| commit | 7cee919f57c916ee6e3291c795fe25802d17c3ba (patch) | |
| tree | abd98b726420671f1036c1b96419cf5a102fa536 | |
| parent | d169e3fd596928ae2e43aaeb9e42b5e827d61a11 (diff) | |
| download | nextcloud-server-7cee919f57c916ee6e3291c795fe25802d17c3ba.tar.gz nextcloud-server-7cee919f57c916ee6e3291c795fe25802d17c3ba.zip | |
Fix busy state loading animation in files
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| -rw-r--r-- | apps/files/css/files.scss | 10 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 8d5d245a6ce..7c2d3b0bb1c 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -296,11 +296,19 @@ table td.filename a.name { line-height: 50px; padding: 0; } +table td.filename label.icon-loading-small { + &:after { + z-index: 10; + } + .thumbnail { + opacity: 0.2; + } +} table td.filename .thumbnail { display: inline-block; width: 32px; height: 32px; - margin-left: 8px; + margin-left: 9px; margin-top: 9px; cursor: pointer; float: left; diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 48ac0f4e33a..fd13deedc0d 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -2540,11 +2540,9 @@ $tr.toggleClass('busy', state); if (state) { - $thumbEl.attr('data-oldimage', $thumbEl.css('background-image')); - $thumbEl.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')'); + $thumbEl.parent().addClass('icon-loading-small'); } else { - $thumbEl.css('background-image', $thumbEl.attr('data-oldimage')); - $thumbEl.removeAttr('data-oldimage'); + $thumbEl.parent().removeClass('icon-loading-small'); } }); }, |