summaryrefslogtreecommitdiffstats
path: root/remoting/webapp
diff options
context:
space:
mode:
authorjamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-23 00:00:50 +0000
committerjamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-23 00:00:50 +0000
commit8c6a5817ff95394bc8549b77876ab879e1f527f3 (patch)
treea1de27a7f955081d23b35f235b26c9434ed3d287 /remoting/webapp
parent6b78e39fdcccb035283a2cac91580b3328016184 (diff)
downloadchromium_src-8c6a5817ff95394bc8549b77876ab879e1f527f3.zip
chromium_src-8c6a5817ff95394bc8549b77876ab879e1f527f3.tar.gz
chromium_src-8c6a5817ff95394bc8549b77876ab879e1f527f3.tar.bz2
Removed question-mark from Help link. Set minimum button size. Added tool-bar preview.
BUG=93464, 93452 TEST=Manual Review URL: http://codereview.chromium.org/7708016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/webapp')
-rw-r--r--remoting/webapp/me2mom/_locales/en/messages.json2
-rw-r--r--remoting/webapp/me2mom/choice.css1
-rw-r--r--remoting/webapp/me2mom/remoting.js7
-rw-r--r--remoting/webapp/me2mom/toolbar.css2
4 files changed, 10 insertions, 2 deletions
diff --git a/remoting/webapp/me2mom/_locales/en/messages.json b/remoting/webapp/me2mom/_locales/en/messages.json
index 056efef..867b696 100644
--- a/remoting/webapp/me2mom/_locales/en/messages.json
+++ b/remoting/webapp/me2mom/_locales/en/messages.json
@@ -122,7 +122,7 @@
"description": "Footer text displayed at the host after an access code has been generated, but before a client connects."
},
"HELP": {
- "message": "Help?",
+ "message": "Help",
"description": "Help link, displayed in the top-left (assuming ltr layout) corner of the main screen. Clicking this takes the user to our FAQ."
},
"INSTRUCTIONS_SHARE_ABOVE": {
diff --git a/remoting/webapp/me2mom/choice.css b/remoting/webapp/me2mom/choice.css
index 7476fd9..5e4140a 100644
--- a/remoting/webapp/me2mom/choice.css
+++ b/remoting/webapp/me2mom/choice.css
@@ -27,6 +27,7 @@ button, input {
button {
background: -webkit-linear-gradient(#fafafa, #f4f4f4 40%, #e5e5e5);
border: 1px solid #aaa;
+ min-width: 72px;
-webkit-border-radius: 2px;
-webkit-box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1);
-webkit-user-select: none;
diff --git a/remoting/webapp/me2mom/remoting.js b/remoting/webapp/me2mom/remoting.js
index c0a0a3c..3b3d637 100644
--- a/remoting/webapp/me2mom/remoting.js
+++ b/remoting/webapp/me2mom/remoting.js
@@ -389,6 +389,12 @@ function updateStatistics() {
window.setTimeout(updateStatistics, 1000);
}
+function showToolbarPreview_() {
+ var toolbar = document.getElementById('session-toolbar');
+ addClass(toolbar, 'toolbar-preview');
+ window.setTimeout(removeClass, 3000, toolbar, 'toolbar-preview');
+}
+
function onClientStateChange_(oldState) {
var state = remoting.session.state;
if (state == remoting.ClientSession.State.CREATED) {
@@ -400,6 +406,7 @@ function onClientStateChange_(oldState) {
} else if (state == remoting.ClientSession.State.INITIALIZING) {
remoting.debug.log('Initializing connection');
} else if (state == remoting.ClientSession.State.CONNECTED) {
+ showToolbarPreview_();
remoting.setMode(remoting.AppMode.IN_SESSION);
updateStatistics();
var accessCode = document.getElementById('access-code-entry');
diff --git a/remoting/webapp/me2mom/toolbar.css b/remoting/webapp/me2mom/toolbar.css
index 101041f..3ace5ad 100644
--- a/remoting/webapp/me2mom/toolbar.css
+++ b/remoting/webapp/me2mom/toolbar.css
@@ -18,7 +18,7 @@
padding: 3px 9px;
}
-.toolbar-container:hover {
+.toolbar-container:hover, .toolbar-preview {
top: -8px;
-webkit-transition-delay: 0s;
}