diff options
| author | Vincent Chan <plus.vincchan@gmail.com> | 2016-06-15 13:16:11 +0200 |
|---|---|---|
| committer | Vincent Chan <plus.vincchan@gmail.com> | 2016-06-15 14:42:39 +0200 |
| commit | 10f8d643dc44ddf82db3cfd91d529d47cfe2d94d (patch) | |
| tree | 610b792d17d0bbee72876c462e0734cd75f26f02 /apps/files | |
| parent | 5315a479f35f0b9fedcbb18a8a0272c16b5ea16d (diff) | |
| download | nextcloud-server-10f8d643dc44ddf82db3cfd91d529d47cfe2d94d.tar.gz nextcloud-server-10f8d643dc44ddf82db3cfd91d529d47cfe2d94d.zip | |
store icons in class
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/css/files.css | 4 | ||||
| -rw-r--r-- | apps/files/js/file-upload.js | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index ccf91e377c9..f8a2d17aaf6 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -85,10 +85,6 @@ background-color: rgb(179, 230, 255)!important; } -.dropping-to-dir .thumbnail { - background-image: url(/nextcloud/core/img/filetypes/folder-drag-accept.svg)!important; -} - /* icons for sidebar */ .nav-icon-files { background-image: url('../img/folder.svg'); diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index d53ce1bd7ec..2453cc5207c 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -667,7 +667,7 @@ OC.Upload = { OC.Upload._hideProgressBar(); } }); - fileupload.on('fileuploaddragover', function(e, data){ + fileupload.on('fileuploaddragover', function(e){ $('#app-content').addClass('file-drag'); var filerow = $(e.delegatedEvent.target).closest('tr'); @@ -675,17 +675,20 @@ OC.Upload = { if(!filerow.hasClass('dropping-to-dir')){ $('.dropping-to-dir').removeClass('dropping-to-dir'); $('.dir-drop').removeClass('dir-drop'); + $('.icon-filetype-folder-drag-accept').removeClass('icon-filetype-folder-drag-accept'); } if(filerow.attr('data-type') === 'dir'){ $('#app-content').addClass('dir-drop'); filerow.addClass('dropping-to-dir'); + filerow.find('.thumbnail').addClass('icon-filetype-folder-drag-accept'); } }); - fileupload.on('fileuploaddragleave fileuploaddrop', function (e, data){ + fileupload.on('fileuploaddragleave fileuploaddrop', function (){ $('#app-content').removeClass('file-drag'); $('.dropping-to-dir').removeClass('dropping-to-dir'); $('.dir-drop').removeClass('dir-drop'); + $('.icon-filetype-folder-drag-accept').removeClass('icon-filetype-folder-drag-accept'); }); } else { // for all browsers that don't support the progress bar |