Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: Use new spinner when logging in

This commit is contained in:
Robin Ward 2014-11-13 13:43:54 -05:00
parent 7b50244e98
commit 61109a43d2
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/templates/modal/login.hbs
View File

@ -56,7 +56,5 @@
  {{i18n login.authenticating}}   {{i18n login.authenticating}}
{{/if}} {{/if}}
{{#if showSpinner}} {{loading-spinner condition=showSpinner class="login-spinner"}}
&nbsp; <i class='fa fa-spinner fa-spin'></i>
{{/if}}
</div> </div>

10
app/assets/stylesheets/common/base/modal.scss
View File

@ -74,6 +74,16 @@
margin-left: 15px; margin-left: 15px;
padding: 14px 15px 15px; padding: 14px 15px 15px;
border-top: 1px solid scale-color-diff(); 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:before,
.modal-footer:after { .modal-footer:after {