diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-06-21 12:22:28 -0400 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-06-21 12:22:28 -0400 |
| commit | 937705ccb0b53f22e9e5e3397a0d03142142d8c6 (patch) | |
| tree | 4d617491309a5b4868efb4d12854f6329fbc6dc0 /src/components/login_form/login_form.vue | |
| parent | e113d0a250d914fa490e632e21abd53206e6482e (diff) | |
| parent | 1a5ee95ee4e7b739158bc7571b01b32b1af792ad (diff) | |
Merge branch 'feature/registration' into 'develop'
Add a registration form.
See merge request !76
Diffstat (limited to 'src/components/login_form/login_form.vue')
| -rw-r--r-- | src/components/login_form/login_form.vue | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue index b2fa5341..d6291148 100644 --- a/src/components/login_form/login_form.vue +++ b/src/components/login_form/login_form.vue @@ -15,7 +15,10 @@ <input :disabled="loggingIn" v-model='user.password' class='form-control' id='password' type='password'> </div> <div class='form-group'> - <button :disabled="loggingIn" type='submit' class='btn btn-default base05 base01-background'>Submit</button> + <div class='login-bottom'> + <div><router-link :to="{name: 'registration'}" v-if='registrationOpen' class='register'>Register</router-link></div> + <button :disabled="loggingIn" type='submit' class='btn btn-default base05 base01-background'>Log in</button> + </div> </div> <div v-if="authError" class='form-group'> <div class='error base05'>{{authError}}</div> @@ -39,8 +42,8 @@ } .btn { - margin-top: 1.0em; min-height: 28px; + width: 10em; } .error { @@ -50,6 +53,18 @@ min-height: 28px; line-height: 28px; } + + .register { + flex: 1 1; + } + + .login-bottom { + margin-top: 1.0em; + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + } } </style> |