diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 691642811b7..87dfea491e7 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -2,9 +2,9 @@ $(document).ready(function() { if (typeof FileActions !== 'undefined') { - FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/undelete.png'), function(filename) { + FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename) { var tr=$('tr').filterAttr('data-file', filename); - var spinner = ''; + var spinner = ''; var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date"); var files = tr.attr('data-file'); undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner; @@ -94,7 +94,7 @@ $(document).ready(function() { $('.undelete').click('click',function(event) { event.preventDefault(); - var spinner = ''; + var spinner = ''; var files=getSelectedFiles('file'); var fileslist = JSON.stringify(files); var dirlisting=getSelectedFiles('dirlisting')[0]; diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index cb5edaa2c91..66ec36df867 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -18,7 +18,7 @@ <?php p($l->t( 'Restore' )); ?>" /> + src="" /> t('Restore'))?> diff --git a/core/css/styles.css b/core/css/styles.css index 40a17a42876..6c9d00114a0 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -416,7 +416,13 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin #oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;} .ui-dialog {position:fixed !important;} span.ui-icon {float: left; margin: 3px 7px 30px 0;} + .loading { background: url('../img/loading.gif') no-repeat center; cursor: wait; } +.move2trash { /* decrease spinner size */ + width: 16px; + height: 16px; +} + /* ---- CATEGORIES ---- */ #categoryform .scrollarea { position:absolute; left:10px; top:10px; right:10px; bottom:50px; overflow:auto; border:1px solid #ddd; background:#f8f8f8; } @@ -655,13 +661,13 @@ div.crumb:active { /* icons */ .folder-icon { background-image: url('../img/places/folder.svg'); } .delete-icon { background-image: url('../img/actions/delete.svg'); } -.delete-icon:hover { background-image: url('../img/actions/delete-hover.svg'); } .edit-icon { background-image: url('../img/actions/rename.svg'); } /* buttons */ button.loading { background-image: url('../img/loading.gif'); background-position: right 10px center; background-repeat: no-repeat; + background-size: 16px; padding-right: 30px; } diff --git a/core/img/actions/add.png b/core/img/actions/add.png index 25d472b2dc4..1aac02b8454 100644 Binary files a/core/img/actions/add.png and b/core/img/actions/add.png differ diff --git a/core/img/actions/add.svg b/core/img/actions/add.svg index 136d6c4b311..250746e1660 100644 --- a/core/img/actions/add.svg +++ b/core/img/actions/add.svg @@ -1,10 +1,6 @@ - - - - - - - - + + + + diff --git a/core/img/actions/delete-hover.png b/core/img/actions/delete-hover.png deleted file mode 100644 index 048d91cee51..00000000000 Binary files a/core/img/actions/delete-hover.png and /dev/null differ diff --git a/core/img/actions/delete-hover.svg b/core/img/actions/delete-hover.svg deleted file mode 100644 index 3e8d26c9786..00000000000 --- a/core/img/actions/delete-hover.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png index fa8e18183ed..99f549faf9b 100644 Binary files a/core/img/actions/delete.png and b/core/img/actions/delete.png differ diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg index ef564bfd482..568185c5c70 100644 --- a/core/img/actions/delete.svg +++ b/core/img/actions/delete.svg @@ -1,6 +1,12 @@ - - - - + + + + image/svg+xml + + + + + + diff --git a/core/img/actions/lock.png b/core/img/actions/lock.png index dbcffa3990f..f3121811ea6 100644 Binary files a/core/img/actions/lock.png and b/core/img/actions/lock.png differ diff --git a/core/img/actions/mail.png b/core/img/actions/mail.png index 8e884fbc0ea..be6142444ae 100644 Binary files a/core/img/actions/mail.png and b/core/img/actions/mail.png differ diff --git a/core/img/actions/mail.svg b/core/img/actions/mail.svg index 2c63daac034..c01f2c113e7 100644 --- a/core/img/actions/mail.svg +++ b/core/img/actions/mail.svg @@ -1,8 +1,4 @@ - - - - - - + + diff --git a/core/img/actions/undelete.png b/core/img/actions/undelete.png deleted file mode 100644 index d712527ef61..00000000000 Binary files a/core/img/actions/undelete.png and /dev/null differ diff --git a/core/img/loader.gif b/core/img/loader.gif deleted file mode 100644 index e192ca895cd..00000000000 Binary files a/core/img/loader.gif and /dev/null differ diff --git a/core/img/loading-dark.gif b/core/img/loading-dark.gif index 5fe86acabc4..13f0f64eab1 100644 Binary files a/core/img/loading-dark.gif and b/core/img/loading-dark.gif differ diff --git a/core/img/loading.gif b/core/img/loading.gif index 5b33f7e54f4..f8f3dff6fb9 100644 Binary files a/core/img/loading.gif and b/core/img/loading.gif differ diff --git a/core/img/remoteStorage-big.png b/core/img/remoteStorage-big.png deleted file mode 100644 index 7e76e21209e..00000000000 Binary files a/core/img/remoteStorage-big.png and /dev/null differ diff --git a/core/img/weather-clear.png b/core/img/weather-clear.png deleted file mode 100644 index 0acf7a9b2af..00000000000 Binary files a/core/img/weather-clear.png and /dev/null differ