diff --git a/media/img/folder-192.png b/media/img/folder-192.png new file mode 100644 index 0000000000..a7cca733a0 Binary files /dev/null and b/media/img/folder-192.png differ diff --git a/static/scripts/app/views/dirent.js b/static/scripts/app/views/dirent.js index 73128f8b3b..fecf79f608 100644 --- a/static/scripts/app/views/dirent.js +++ b/static/scripts/app/views/dirent.js @@ -35,12 +35,13 @@ define([ var dirent_path = Common.pathJoin([dir.path, this.model.get('obj_name')]); var is_pro = app.pageOptions.is_pro; var file_audit_enabled = app.pageOptions.file_audit_enabled; + var file_icon_size = Common.isHiDPI() ? 48 : 24; this.$el.html(this.template({ dirent: this.model.attributes, dirent_path: dirent_path, encoded_path: Common.encodePath(dirent_path), - icon_url: this.model.getIconUrl(48), + icon_url: this.model.getIconUrl(file_icon_size), url: this.model.getWebUrl(), download_url: this.model.getDownloadUrl(), category: dir.category, diff --git a/static/scripts/common.js b/static/scripts/common.js index b7268030ff..a72960e4f3 100644 --- a/static/scripts/common.js +++ b/static/scripts/common.js @@ -212,10 +212,27 @@ define([ }, getDirIconUrl: function(is_readonly, size) { - if (is_readonly) { - return app.config.mediaUrl + "img/folder-read-only-192.png"; + if (size > 24) { + if (is_readonly) { + return app.config.mediaUrl + "img/folder-read-only-192.png"; + } else { + return app.config.mediaUrl + "img/folder-192.png"; + } } else { - return app.config.mediaUrl + "img/folder-beige-192.png"; + if (is_readonly) { + return app.config.mediaUrl + "img/folder-read-only-24.png"; + } else { + return app.config.mediaUrl + "img/folder-24.png"; + } + } + }, + + isHiDPI: function() { + var pixelRatio = window.devicePixelRatio ? window.devicePixelRatio : 1; + if (pixelRatio > 1) { + return true; + } else { + return false; } },