aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+login
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/+login')
-rw-r--r--client/src/app/+login/login.component.html23
-rw-r--r--client/src/app/+login/login.component.scss4
2 files changed, 14 insertions, 13 deletions
diff --git a/client/src/app/+login/login.component.html b/client/src/app/+login/login.component.html
index 10e25a936..834ea6e51 100644
--- a/client/src/app/+login/login.component.html
+++ b/client/src/app/+login/login.component.html
@@ -5,18 +5,7 @@
5</h1> 5</h1>
6 6
7<div class="margin-content"> 7<div class="margin-content">
8 <div class="alert alert-danger" i18n *ngIf="externalAuthError">
9 Sorry but there was an issue with the external login process. Please <a routerLink="/about">contact an administrator</a>.
10 </div>
11
12 <ng-container *ngIf="!externalAuthError && !isAuthenticatedWithExternalAuth"> 8 <ng-container *ngIf="!externalAuthError && !isAuthenticatedWithExternalAuth">
13 <div *ngIf="error" class="alert alert-danger">
14 {{ error }}
15
16 <span *ngIf="error === 'User email is not verified.'">
17 <a i18n routerLink="/verify-account/ask-send-email">Request new verification email.</a>
18 </span>
19 </div>
20 9
21 <div class="alert pt-alert-primary" role="alert"> 10 <div class="alert pt-alert-primary" role="alert">
22 <h5 class="alert-heading" i18n> 11 <h5 class="alert-heading" i18n>
@@ -34,6 +23,18 @@
34 </p> 23 </p>
35 </div> 24 </div>
36 25
26 <div class="alert alert-danger" i18n *ngIf="externalAuthError">
27 Sorry but there was an issue with the external login process. Please <a class="link-orange" routerLink="/about">contact an administrator</a>.
28 </div>
29
30 <div *ngIf="error" class="alert alert-danger">
31 {{ error }}
32
33 <a *ngIf="error === 'User email is not verified.'" class="ms-1 link-orange" i18n routerLink="/verify-account/ask-send-email">
34 Request new verification email
35 </a>
36 </div>
37
37 <div class="wrapper"> 38 <div class="wrapper">
38 <div class="login-form-and-externals"> 39 <div class="login-form-and-externals">
39 40
diff --git a/client/src/app/+login/login.component.scss b/client/src/app/+login/login.component.scss
index 79a2081fe..d31d428f7 100644
--- a/client/src/app/+login/login.component.scss
+++ b/client/src/app/+login/login.component.scss
@@ -51,11 +51,11 @@ input[type=email] {
51} 51}
52 52
53.wrapper, 53.wrapper,
54.pt-alert-primary { 54.alert {
55 max-width: 1200px; 55 max-width: 1200px;
56} 56}
57 57
58.pt-alert-primary { 58.alert {
59 margin: 0 auto 30px; 59 margin: 0 auto 30px;
60} 60}
61 61