From 61109a43d2ddd2f778bb0623f0aa827d824a9a6c Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 13 Nov 2014 13:43:54 -0500 Subject: [PATCH] UX: Use new spinner when logging in --- .../javascripts/discourse/templates/modal/login.hbs | 4 +--- app/assets/stylesheets/common/base/modal.scss | 10 ++++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs index 8ee34887b0f..a9051c1fe57 100644 --- a/app/assets/javascripts/discourse/templates/modal/login.hbs +++ b/app/assets/javascripts/discourse/templates/modal/login.hbs @@ -56,7 +56,5 @@   {{i18n login.authenticating}} {{/if}} - {{#if showSpinner}} -   - {{/if}} + {{loading-spinner condition=showSpinner class="login-spinner"}} diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss index 2688a184754..f17cf1f78f3 100644 --- a/app/assets/stylesheets/common/base/modal.scss +++ b/app/assets/stylesheets/common/base/modal.scss @@ -74,6 +74,16 @@ margin-left: 15px; padding: 14px 15px 15px; border-top: 1px solid scale-color-diff(); + .login-spinner { + display: inline-block; + margin: 0; + .spinner { + margin: 0; + width: 10px; + height: 10px; + display: inline-block; + } + } } .modal-footer:before, .modal-footer:after {