Skip to content

Commit

Permalink
store icons in class
Browse files Browse the repository at this point in the history
  • Loading branch information
vincchan committed Jun 15, 2016
1 parent b8fba29 commit 1b7f8cc
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 10 deletions.
4 changes: 0 additions & 4 deletions apps/files/css/files.css
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,6 @@
background-color: rgb(179, 230, 255)!important;
}

.dropping-to-dir .thumbnail {
background-image: url(../img/folder-drag-accept.svg)!important;
}

/* icons for sidebar */
.nav-icon-files {
background-image: url('../img/folder.svg');
Expand Down
Binary file removed apps/files/img/folder-drag-accept.png
Binary file not shown.
4 changes: 0 additions & 4 deletions apps/files/img/folder-drag-accept.svg

This file was deleted.

7 changes: 5 additions & 2 deletions apps/files/js/file-upload.js
Original file line number Diff line number Diff line change
Expand Up @@ -667,25 +667,28 @@ 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');

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
Expand Down
4 changes: 4 additions & 0 deletions core/css/icons.css
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,10 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
background-image: url('../img/filetypes/folder.svg');
}

.icon-filetype-folder-drag-accept {
background-image: url('../img/filetypes/folder-drag-accept.svg')!important;
}

.icon-home {
background-image: url('../img/places/home.svg');
}
Expand Down

0 comments on commit 1b7f8cc

Please sign in to comment.