From 074fa81182789443ac4ae2c1ec612a84b6a0e6f9 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 13 Nov 2014 13:50:19 -0500
Subject: [PATCH] UX: Proper loading spinner on create account

---
 .../discourse/templates/modal/create-account.hbs            | 6 ++----
 app/assets/stylesheets/common/base/modal.scss               | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index a26ba984e26..3777855e948 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -88,13 +88,11 @@
   {{#if showCreateForm}}
     <div class="modal-footer">
       <button class='btn btn-large btn-primary' {{bind-attr disabled="submitDisabled"}} {{action "createAccount"}}>{{i18n create_account.title}}</button>
-      {{#if formSubmitted}}
-        &nbsp; <i class='fa fa-spinner fa-spin'></i>
-      {{else}}
+      {{#loading-spinner condition=formSubmitted class="create-spinner"}}
         <button class="btn btn-large" id="login-link" {{action "showLogin"}}>
           {{i18n log_in}}
         </button>
-      {{/if}}
+      {{/loading-spinner}}
     </div>
   {{/if}}
 {{/unless}}
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index f17cf1f78f3..3b1158eb28c 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -74,7 +74,7 @@
   margin-left: 15px;
   padding: 14px 15px 15px;
   border-top: 1px solid scale-color-diff();
-  .login-spinner {
+  .login-spinner, .create-spinner {
     display: inline-block;
     margin: 0;
     .spinner {