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

login fixes, auth message and alignment

This commit is contained in:
Kris 2018-05-25 19:15:39 -04:00
parent c91071bb2a
commit cc0a5f4526
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,8 +51,7 @@
{{/second-factor-form}} {{/second-factor-form}}
</form> </form>
{{/if}} {{/if}}
{{authMessage}}
<div id='login-alert' class={{alertClass}}>{{alert}}</div>
{{/d-modal-body}} {{/d-modal-body}}
<div class="modal-footer"> <div class="modal-footer">
@ -74,4 +73,6 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
</div> </div>
<div class="auth-message">{{authMessage}}</div>
<div id='login-alert' class={{alertClass}}>{{alert}}</div>
{{/login-modal}} {{/login-modal}}

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

@ -33,9 +33,7 @@
{{/second-factor-form}} {{/second-factor-form}}
</form> </form>
{{/if}} {{/if}}
{{authMessage}}
<div id='login-alert' class={{alertClass}}>{{alert}}</div>
{{#if showLoginButtons}} {{#if showLoginButtons}}
{{login-buttons {{login-buttons
canLoginLocalWithEmail=canLoginLocalWithEmail canLoginLocalWithEmail=canLoginLocalWithEmail
@ -66,4 +64,7 @@
{{conditional-loading-spinner condition=showSpinner size="small"}} {{conditional-loading-spinner condition=showSpinner size="small"}}
</div> </div>
<div class="auth-message">{{authMessage}}</div>
<div id='login-alert' class={{alertClass}}>{{alert}}</div>
{{/login-modal}} {{/login-modal}}

9
app/assets/stylesheets/common/base/login.scss
View File

@ -46,6 +46,11 @@ $input-width: 220px;
width: 100%; width: 100%;
} }
} }
.modal-footer {
.inline-spinner {
display: inline-flex;
}
}
} }
.create-account { .create-account {
@ -138,6 +143,10 @@ $input-width: 220px;
} }
} }
.auth-message {
padding: 0 15px 15px 15px
}
.modal tr.instructions { .modal tr.instructions {
display: flex; display: flex;
flex-direction: column; flex-direction: column;