1 files changed, 26 insertions, 27 deletions
diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html
index bcea0a27a..24807987c 100644
--- a/client/src/app/login/login.component.html
+++ b/client/src/app/login/login.component.html
@@ -1,34 +1,33 @@
-<div class="row">
+<div class="margin-content">
-  <div class="content-padding">
+  <div class="title-page title-page-single">
+    Login
-    <h3>Login</h3>
+  </div>
-    <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
+  <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
-    <form role="form" (ngSubmit)="login()" [formGroup]="form">
+  <form role="form" (ngSubmit)="login()" [formGroup]="form">
-      <div class="form-group">
+    <div class="form-group">
-        <label for="username">Username</label>
+      <label for="username">Username</label>
-        <input
+      <input
-          type="text" class="form-control" id="username" placeholder="Username" required
+        type="text" id="username" placeholder="Username" required
-          formControlName="username"
+        formControlName="username" [ngClass]="{ 'input-error': formErrors['username'] }"
-        >
+      >
-        <div *ngIf="formErrors.username" class="alert alert-danger">
+      <div *ngIf="formErrors.username" class="form-error">
-          {{ formErrors.username }}
+        {{ formErrors.username }}
-        </div>
      </div>
+    </div>
-      <div class="form-group">
+    <div class="form-group">
-        <label for="password">Password</label>
+      <label for="password">Password</label>
-        <input
+      <input
-          type="password" class="form-control" name="password" id="password" placeholder="Password" required
+        type="password" name="password" id="password" placeholder="Password" required
-          formControlName="password"
+        formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }"
-        >
+      >
-        <div *ngIf="formErrors.password" class="alert alert-danger">
+      <div *ngIf="formErrors.password" class="form-error">
-          {{ formErrors.password }}
+        {{ formErrors.password }}
-        </div>
      </div>
+    </div>
-      <input type="submit" value="Login" class="btn btn-default" [disabled]="!form.valid">
+    <input type="submit" value="Login" [disabled]="!form.valid">
-    </form>
+  </form>
-  </div>
 </div>

diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html index bcea0a27a..24807987c 100644 --- a/client/src/app/login/login.component.html +++ b/client/src/app/login/login.component.html
@@ -1,34 +1,33 @@
1	<div class="row">	1	<div class="margin-content">
2	<div class="content-padding">	2	<div class="title-page title-page-single">
3		3	Login
4	<h3>Login</h3>	4	</div>
5		5
6	<div *ngIf="error" class="alert alert-danger">{{ error }}</div>	6	<div *ngIf="error" class="alert alert-danger">{{ error }}</div>
7		7
8	<form role="form" (ngSubmit)="login()" [formGroup]="form">	8	<form role="form" (ngSubmit)="login()" [formGroup]="form">
9	<div class="form-group">	9	<div class="form-group">
10	<label for="username">Username</label>	10	<label for="username">Username</label>
11	<input	11	<input
12	type="text" class="form-control" id="username" placeholder="Username" required	12	type="text" id="username" placeholder="Username" required
13	formControlName="username"	13	formControlName="username" [ngClass]="{ 'input-error': formErrors['username'] }"
14	>	14	>
15	<div *ngIf="formErrors.username" class="alert alert-danger">	15	<div *ngIf="formErrors.username" class="form-error">
16	{{ formErrors.username }}	16	{{ formErrors.username }}
17	</div>
18	</div>	17	</div>
		18	</div>
19		19
20	<div class="form-group">	20	<div class="form-group">
21	<label for="password">Password</label>	21	<label for="password">Password</label>
22	<input	22	<input
23	type="password" class="form-control" name="password" id="password" placeholder="Password" required	23	type="password" name="password" id="password" placeholder="Password" required
24	formControlName="password"	24	formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }"
25	>	25	>
26	<div *ngIf="formErrors.password" class="alert alert-danger">	26	<div *ngIf="formErrors.password" class="form-error">
27	{{ formErrors.password }}	27	{{ formErrors.password }}
28	</div>
29	</div>	28	</div>
		29	</div>
30		30
31	<input type="submit" value="Login" class="btn btn-default" [disabled]="!form.valid">	31	<input type="submit" value="Login" [disabled]="!form.valid">
32	</form>	32	</form>
33	</div>
34	</div>	33	</div>