r167599 - in trunk/src/chrome/browser/resources/chromeos/login: . images

[r...@chromium.org]

Author: r...@chromium.org
Date: Tue Nov 13 21:04:17 2012
New Revision: 167599

Log:
Fix Chrome logo to transition smoothly between the demo login screen and login spinner.

R=dpol...@chromium.org
BUG=160433


Review URL: https://chromiumcodereview.appspot.com/11312225

Removed:
trunk/src/chrome/browser/resources/chromeos/login/images/chrome_center_logo.jpg
Modified:
trunk/src/chrome/browser/resources/chromeos/login/demo_user_login.css (contents, props changed)
trunk/src/chrome/browser/resources/chromeos/login/demo_user_login.html (contents, props changed)
trunk/src/chrome/browser/resources/chromeos/login/demo_user_login.js

Modified: trunk/src/chrome/browser/resources/chromeos/login/demo_user_login.css
==============================================================================
--- trunk/src/chrome/browser/resources/chromeos/login/demo_user_login.css (original)
+++ trunk/src/chrome/browser/resources/chromeos/login/demo_user_login.css Tue Nov 13 21:04:17 2012
@@ -38,6 +38,11 @@
}

#demo-login-text {
- font-size: 24px;
- padding-top: 80px;
+ font-size: 14px;
+ padding-left: 30px;
+ padding-top: 10px;
+}
+
+#lower-container {
+ height: 40px;
}

Modified: trunk/src/chrome/browser/resources/chromeos/login/demo_user_login.html
==============================================================================
--- trunk/src/chrome/browser/resources/chromeos/login/demo_user_login.html (original)
+++ trunk/src/chrome/browser/resources/chromeos/login/demo_user_login.html Tue Nov 13 21:04:17 2012
@@ -11,11 +11,12 @@
<div id="page">
<div id="logo-container">
<div>
- <img id="logo" src="images/chrome_center_logo.jpg">
- <img id="logo-login" src="images/chrome_retail_login.png" hidden>
+ <img id="logo" src="images/chrome_retail_login.png">
</div>
- <div id="demo-login-text" i18n-content="demoLoginMessage"></div>
- <div id="login-spinner" class="inline-spinner" hidden></div>
+ <div id="lower-container">
+ <div id="demo-login-text" i18n-content="demoLoginMessage"></div>
+ <div id="login-spinner" class="inline-spinner" hidden></div>
+ </div>
</div>
</div>
</body>

Modified: trunk/src/chrome/browser/resources/chromeos/login/demo_user_login.js
==============================================================================
--- trunk/src/chrome/browser/resources/chromeos/login/demo_user_login.js (original)
+++ trunk/src/chrome/browser/resources/chromeos/login/demo_user_login.js Tue Nov 13 21:04:17 2012
@@ -38,12 +38,8 @@
// We're already logging in - don't login on click.
document.removeEventListener('click', onClick);

- // Hide the "Click to start" assets.
- $('logo').hidden = true;
+ // Hide the "Click to start" and show the spinner.
$('demo-login-text').hidden = true;
-
- // Show the "Logging in" assets.
- $('logo-login').hidden = false;
$('login-spinner').hidden = false;
};