diff options
7 files changed, 38 insertions, 32 deletions
diff --git a/chrome/browser/resources/chromeos/login/oobe.css b/chrome/browser/resources/chromeos/login/oobe.css index a4d58a3..aecc76f 100644 --- a/chrome/browser/resources/chromeos/login/oobe.css +++ b/chrome/browser/resources/chromeos/login/oobe.css @@ -577,33 +577,6 @@ button { text-decoration: underline; } -@-webkit-keyframes oauth-enroll-spinner { - /* There are 13 animation steps, the numbers below space them evenly. Note - * that a steps(13) declaration produces off-by-one offsets for some frames, - * so for best results we specify positions explicity and use step-end. */ - 0% { background-position: 286px 0px; } - 7.6923076% { background-position: 264px 0px; } - 15.3846153% { background-position: 242px 0px; } - 23.0769230% { background-position: 220px 0px; } - 30.7692307% { background-position: 198px 0px; } - 38.4615384% { background-position: 176px 0px; } - 46.1538461% { background-position: 154px 0px; } - 53.8461538% { background-position: 132px 0px; } - 61.5384615% { background-position: 110px 0px; } - 69.2307692% { background-position: 88px 0px; } - 76.9230769% { background-position: 66px 0px; } - 84.6153846% { background-position: 44px 0px; } - 92.3076923% { background-position: 22px 0px; } - 100.0000000% { background-position: 0px 0px; } -} - -.oauth-enroll-spinner { - -webkit-animation: oauth-enroll-spinner 1s step-end infinite; - background-image: url('chrome://theme/IDR_SPINNER'); - height: 22px; - width: 22px; -} - #close-button.visible { display: inline-block; } @@ -816,6 +789,7 @@ html[dir=rtl] .error-message { left: 10px; opacity: 1.0; position: absolute; + right: 10px; text-shadow: 0 1px 1px #fff; } diff --git a/chrome/browser/resources/chromeos/login/oobe.html b/chrome/browser/resources/chromeos/login/oobe.html index 56e4e17..a65a573 100644 --- a/chrome/browser/resources/chromeos/login/oobe.html +++ b/chrome/browser/resources/chromeos/login/oobe.html @@ -10,6 +10,7 @@ <link rel="stylesheet" href="screen_account_picker.css"> <link rel="stylesheet" href="screen_offline_message.css"> <link rel="stylesheet" href="screen_signin.css"> +<link rel="stylesheet" href="spinner.css"> <link rel="stylesheet" href="user_pod_row.css"> <script src="chrome://resources/js/cr.js"></script> <script src="chrome://resources/js/cr/event_target.js"></script> diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.html b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.html index ec78ade2..ab53d9f 100644 --- a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.html +++ b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.html @@ -7,7 +7,7 @@ <div id="oauth-enroll-step-working" class="oauth-enroll-step-center" hidden> <div class="oauth-enroll-step-content"> <span class="oauth-enroll-step-icon"> - <span class="oauth-enroll-spinner"></span> + <span class="spinner"></span> </span> <span class="oauth-enroll-step-message" i18n-content="oauthEnrollWorking"> diff --git a/chrome/browser/resources/chromeos/login/screen_gaia_signin.html b/chrome/browser/resources/chromeos/login/screen_gaia_signin.html index 3eeb150..3d68f60 100644 --- a/chrome/browser/resources/chromeos/login/screen_gaia_signin.html +++ b/chrome/browser/resources/chromeos/login/screen_gaia_signin.html @@ -10,6 +10,6 @@ <div id="guestSignin" class="signin-text"></div> </div> <div id="gaia-loading"> - <div class="throbber"></div> + <div class="spinner"></div> </div> </div> diff --git a/chrome/browser/resources/chromeos/login/screen_signin.html b/chrome/browser/resources/chromeos/login/screen_signin.html index 2b6477e..2cec7f7 100644 --- a/chrome/browser/resources/chromeos/login/screen_signin.html +++ b/chrome/browser/resources/chromeos/login/screen_signin.html @@ -4,6 +4,6 @@ i18n-values="placeholder:emailHint"> <input type="password" id="password" i18n-values="placeholder:passwordHint"> - <div id="login-throbber" class="throbber" hidden></div> + <div id="login-spinner" class="spinner" hidden></div> </div> </div> diff --git a/chrome/browser/resources/chromeos/login/screen_signin.js b/chrome/browser/resources/chromeos/login/screen_signin.js index 7f4e8e9..e7e6b34 100644 --- a/chrome/browser/resources/chromeos/login/screen_signin.js +++ b/chrome/browser/resources/chromeos/login/screen_signin.js @@ -63,12 +63,12 @@ cr.define('login', function() { }, /** - * Helper function to toggle throbber and input fields. + * Helper function to toggle spinner and input fields. * @param {boolean} enable True to enable credential input UI. * @private */ enableInputs_: function(enable) { - $('login-throbber').hidden = enable; + $('login-spinner').hidden = enable; $('email').hidden = !enable; $('password').hidden = !enable; $('signin-button').hidden = !enable; diff --git a/chrome/browser/resources/chromeos/login/spinner.css b/chrome/browser/resources/chromeos/login/spinner.css new file mode 100644 index 0000000..073ce8a3 --- /dev/null +++ b/chrome/browser/resources/chromeos/login/spinner.css @@ -0,0 +1,31 @@ +/* Copyright (c) 2011 The Chromium Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +@-webkit-keyframes spinner { + /* There are 13 animation steps, the numbers below space them evenly. Note + * that a steps(13) declaration produces off-by-one offsets for some frames, + * so for best results we specify positions explicity and use step-end. */ + 0% { background-position: 286px 0px; } + 7.6923076% { background-position: 264px 0px; } + 15.3846153% { background-position: 242px 0px; } + 23.0769230% { background-position: 220px 0px; } + 30.7692307% { background-position: 198px 0px; } + 38.4615384% { background-position: 176px 0px; } + 46.1538461% { background-position: 154px 0px; } + 53.8461538% { background-position: 132px 0px; } + 61.5384615% { background-position: 110px 0px; } + 69.2307692% { background-position: 88px 0px; } + 76.9230769% { background-position: 66px 0px; } + 84.6153846% { background-position: 44px 0px; } + 92.3076923% { background-position: 22px 0px; } + 100.0000000% { background-position: 0px 0px; } +} + +.spinner { + -webkit-animation: spinner 1s step-end infinite; + background-image: url('chrome://theme/IDR_SPINNER'); + height: 22px; + width: 22px; +} |