summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2013-09-19 10:00:42 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2013-09-19 10:00:42 +0200
commit0d81a53e12bed66e5ec9684424519913283110a5 (patch)
treec98217ccf47a8eebb3c68e3ffb42985d6a9b1f1c /core
parentf7800cd63ef55b9fc0e8379291adeb9e45356fb1 (diff)
downloadnextcloud-server-0d81a53e12bed66e5ec9684424519913283110a5.tar.gz
nextcloud-server-0d81a53e12bed66e5ec9684424519913283110a5.zip
use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there
Diffstat (limited to 'core')
-rw-r--r--core/js/oc-dialogs.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 7ca94dcbaa4..d661a871a5f 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -296,7 +296,7 @@ var OCdialogs = {
var path = getPathForPreview(original.name);
lazyLoadPreview(path, original.type, function(previewpath){
conflict.find('.original .icon').css('background-image','url('+previewpath+')');
- });
+ }, 96, 96);
getCroppedPreview(replacement).then(
function(path){
conflict.find('.replacement .icon').css('background-image','url(' + path + ')');