summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorkaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 16:39:24 +0000
committerkaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 16:39:24 +0000
commit0c9b02747555165ffd6b03ba3f850679f0962ad7 (patch)
tree1b292f119afacad1825a21637968a9c21facd012 /chrome
parent79d7898b59b3f2770323718d5c46539aacc6e80d (diff)
downloadchromium_src-0c9b02747555165ffd6b03ba3f850679f0962ad7.zip
chromium_src-0c9b02747555165ffd6b03ba3f850679f0962ad7.tar.gz
chromium_src-0c9b02747555165ffd6b03ba3f850679f0962ad7.tar.bz2
[filemanager] Thumbnail styles in the preview pane
I fixed the thumbnail dimensions and changed the overlap offset (7px horizontal,0px vertical) according to the latest email from Josh. BUG=chromium-os:20552 TEST= Review URL: http://codereview.chromium.org/8353008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/resources/file_manager/css/file_manager.css10
-rw-r--r--chrome/browser/resources/file_manager/js/file_manager.js3
2 files changed, 4 insertions, 9 deletions
diff --git a/chrome/browser/resources/file_manager/css/file_manager.css b/chrome/browser/resources/file_manager/css/file_manager.css
index a38985d..c58d943 100644
--- a/chrome/browser/resources/file_manager/css/file_manager.css
+++ b/chrome/browser/resources/file_manager/css/file_manager.css
@@ -283,24 +283,20 @@ div.img-container > img {
.preview-thumbnails {
display: -webkit-box;
-webkit-box-orient: horizontal;
- padding-left: 38px;
+ padding-left: 39px;
}
.preview-thumbnails > div.img-container {
width: 45px;
height: 45px;
position: relative;
- margin-left: -38px;
+ margin-left: -39px; /* Show 7 pixels of the overlapped image */
+ margin-right: 0;
overflow: hidden;
border: 1px solid white;
background-color: #F2F2F2;
}
-.preview-thumbnails > div.img-container > img {
- max-width: 100%;
- max-height: 100%;
-}
-
.preview-panel > * {
display: -webkit-box;
-webkit-box-align: center;
diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js
index 6aeac34..3d540ff 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -201,7 +201,7 @@ FileManager.prototype = {
/**
* Maximum amount of thumbnails in the preview pane.
*/
- const MAX_PREVIEW_THUMBAIL_COUNT = 5;
+ const MAX_PREVIEW_THUMBAIL_COUNT = 4;
/**
* Translated strings.
@@ -1716,7 +1716,6 @@ FileManager.prototype = {
if (thumbnailCount < MAX_PREVIEW_THUMBAIL_COUNT) {
var thumbnail = this.renderThumbnailBox_(entry, true);
- thumbnail.style.top = (i * 2) + 'px';
thumbnail.style.zIndex = MAX_PREVIEW_THUMBAIL_COUNT + 1 - i;
this.previewThumbnails_.appendChild(thumbnail);
thumbnailCount++;