codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-12 00:31:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
phoenixeliot 2016-07-26 11:54:16 -07:00
commit 433f4108b8
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/styles/modal/create-account-modal/basic-info-view.sass
View file

@ -20,9 +20,17 @@
input
max-height: 5vh
.help-block
float: right
.fancy-error
padding-top: 29px
line-height: 14px
.form-container
> .form-group, > .row
max-height: 84px
max-height: calc(29px + 29px + 5vh)
flex-grow: 1
align-self: flex-start

13
app/templates/core/create-account-modal/basic-info-view.jade
View file

@ -34,12 +34,11 @@ form#basic-info-form.modal-body.basic-info
.col-xs-5.col-xs-offset-3
label.control-label(for="email-input")
span(data-i18n="share_progress_modal.form_label")
.col-xs-5.col-xs-offset-3
input.form-control.input-lg#email-input(name="email" type="email")
if view.signupState.get('path') === 'student'
.help-block.optional-help-block.pull-right
span(data-i18n="signup.optional")
.col-xs-4.email-check
input.form-control.input-lg#email-input(name="email" type="email")
.col-xs-4.email-check.fancy-error
- var checkEmailState = view.state.get('checkEmailState');
if checkEmailState === 'checking'
span.small(data-i18n="signup.checking")
@ -59,12 +58,11 @@ form#basic-info-form.modal-body.basic-info
.form-group
.row
.col-xs-7.col-xs-offset-3
.col-xs-5.col-xs-offset-3
label.control-label(for="username-input")
span(data-i18n="general.username")
.col-xs-5.col-xs-offset-3
input.form-control.input-lg#username-input(name="name")
.col-xs-4.name-check
.col-xs-4.name-check.fancy-error
- var checkNameState = view.state.get('checkNameState');
if checkNameState === 'checking'
span.small(data-i18n="signup.checking")
@ -81,10 +79,9 @@ form#basic-info-form.modal-body.basic-info
.form-group
.row
.col-xs-7.col-xs-offset-3
.col-xs-5.col-xs-offset-3
label.control-label(for="password-input")
span(data-i18n="general.password")
.col-xs-5.col-xs-offset-3
input.form-control.input-lg#password-input(name="password" type="password")
.form-group.checkbox.subscribe