summaryrefslogtreecommitdiffstats
path: root/ui/file_manager
diff options
context:
space:
mode:
authorfukino <fukino@chromium.org>2015-03-30 17:23:19 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-31 00:24:59 +0000
commit8489d4b9723df4b077c3ceb64aca2ae417bddc1b (patch)
tree6f2ad1993aec537e6ea3b56e7396e27976967892 /ui/file_manager
parent42a5159a983926133a19b1153d66b242856ffb3c (diff)
downloadchromium_src-8489d4b9723df4b077c3ceb64aca2ae417bddc1b.zip
chromium_src-8489d4b9723df4b077c3ceb64aca2ae417bddc1b.tar.gz
chromium_src-8489d4b9723df4b077c3ceb64aca2ae417bddc1b.tar.bz2
Files.app: Add touch feedback on eject button.
Along with adding touch feedback, I enlarged the touch target of eject button. BUG=469943 TEST=manual test Review URL: https://codereview.chromium.org/1040013002 Cr-Commit-Position: refs/heads/master@{#322926}
Diffstat (limited to 'ui/file_manager')
-rw-r--r--ui/file_manager/file_manager/foreground/css/file_manager.css6
-rw-r--r--ui/file_manager/file_manager/foreground/js/ui/directory_tree.js6
2 files changed, 9 insertions, 3 deletions
diff --git a/ui/file_manager/file_manager/foreground/css/file_manager.css b/ui/file_manager/file_manager/foreground/css/file_manager.css
index 24e8c49..0919fc3 100644
--- a/ui/file_manager/file_manager/foreground/css/file_manager.css
+++ b/ui/file_manager/file_manager/foreground/css/file_manager.css
@@ -221,9 +221,9 @@ div.splitter {
url(../images/files/ui/2x/eject.png) 2x) no-repeat center;
cursor: pointer;
flex: none;
- height: 20px;
- margin-right: 6px;
- width: 20px;
+ height: 40px;
+ position: relative;
+ width: 40px;
z-index: 1; /* Make sure .root-eject is on upper layer than paper-ripple. */
}
diff --git a/ui/file_manager/file_manager/foreground/js/ui/directory_tree.js b/ui/file_manager/file_manager/foreground/js/ui/directory_tree.js
index c7483b0..a699aa5 100644
--- a/ui/file_manager/file_manager/foreground/js/ui/directory_tree.js
+++ b/ui/file_manager/file_manager/foreground/js/ui/directory_tree.js
@@ -545,6 +545,12 @@ VolumeItem.prototype.setupEjectButton_ = function(rowElement) {
unmountCommand.execute(this);
}.bind(this));
rowElement.appendChild(ejectButton);
+
+ // Add paper-ripple effect on the eject button.
+ var ripple = cr.doc.createElement('paper-ripple');
+ ripple.setAttribute('fit', '');
+ ripple.className = 'circle recenteringTouch';
+ ejectButton.appendChild(ripple);
}
};