aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-06-12 20:53:45 +0200
committerBjörn Schießle <schiessle@owncloud.com>2013-06-12 20:53:45 +0200
commit27fcdb3af5d1b1012695a09e04c0a654a1dde710 (patch)
tree6de492454c862852de3f51bd8834e2012139b5ac /apps/files/js
parent46e5e9bd73a68f7b50bb79f883a8bc6efacaca97 (diff)
parent3584d48d65900b15dc3ef6831926f4a52e508625 (diff)
downloadnextcloud-server-27fcdb3af5d1b1012695a09e04c0a654a1dde710.tar.gz
nextcloud-server-27fcdb3af5d1b1012695a09e04c0a654a1dde710.zip
Merge branch 'master' into files_encryption_upgrade_fix
Conflicts: apps/files_encryption/tests/crypt.php
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/filelist.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index c24d1fd8244..e19a35bbc5b 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -51,7 +51,7 @@ var FileList={
}else{
simpleSize=t('files', 'Pending');
}
- var sizeColor = Math.round(200-Math.pow((size/(1024*1024)),2));
+ var sizeColor = Math.round(160-Math.pow((size/(1024*1024)),2));
var lastModifiedTime = Math.round(lastModified.getTime() / 1000);
td = $('<td></td>').attr({
"class": "filesize",