3 files changed, 60 insertions, 43 deletions

diff --git a/client/src/app/login/login.component.scss b/client/src/app/login/login.component.scss
index 900b2467a..7978c5891 100644
--- a/client/src/app/login/login.component.scss
+++ b/client/src/app/login/login.component.scss
@@ -20,4 +20,8 @@ input[type=submit] {
 .create-an-account, .forgot-password-button {
   color: #000;
   cursor: pointer;
+  
+  &:hover {
+    text-decoration: underline !important;
+  }
 }
diff --git a/client/src/app/signup/signup.component.html b/client/src/app/signup/signup.component.html
index f7b8f587b..aad4b5be3 100644
--- a/client/src/app/signup/signup.component.html
+++ b/client/src/app/signup/signup.component.html
@@ -4,63 +4,68 @@
     Create an account
   </div>
 
-  <my-instance-features-table></my-instance-features-table>
-
   <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
 
-  <form role="form" (ngSubmit)="signup()" [formGroup]="form">
-    <div class="form-group">
-      <label for="username" i18n>Username</label>
+  <div class="d-flex justify-content-left flex-wrap">
+    <form role="form" (ngSubmit)="signup()" [formGroup]="form">
+      <div class="form-group">
+        <label for="username" i18n>Username</label>
+
+        <div class="input-group">
+          <input
+            type="text" id="username" i18n-placeholder placeholder="Example: jane_doe"
+            formControlName="username" [ngClass]="{ 'input-error': formErrors['username'] }"
+          >
+          <div class="input-group-append">
+            <span class="input-group-text">@{{ instanceHost }}</span>
+          </div>
+        </div>
 
-      <div class="input-group">
+        <div *ngIf="formErrors.username" class="form-error">
+          {{ formErrors.username }}
+        </div>
+      </div>
+
+      <div class="form-group">
+        <label for="email" i18n>Email</label>
         <input
-          type="text" id="username" i18n-placeholder placeholder="Example: neil_amstrong"
-          formControlName="username" [ngClass]="{ 'input-error': formErrors['username'] }"
+          type="text" id="email" i18n-placeholder placeholder="Email"
+          formControlName="email" [ngClass]="{ 'input-error': formErrors['email'] }"
         >
-        <div class="input-group-append">
-          <span class="input-group-text">@{{ instanceHost }}</span>
+        <div *ngIf="formErrors.email" class="form-error">
+          {{ formErrors.email }}
         </div>
       </div>
 
-      <div *ngIf="formErrors.username" class="form-error">
-        {{ formErrors.username }}
+      <div class="form-group">
+        <label for="password" i18n>Password</label>
+        <input
+          type="password" id="password" i18n-placeholder placeholder="Password"
+          formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }"
+        >
+        <div *ngIf="formErrors.password" class="form-error">
+          {{ formErrors.password }}
+        </div>
       </div>
-    </div>
 
-    <div class="form-group">
-      <label for="email" i18n>Email</label>
-      <input
-        type="text" id="email" i18n-placeholder placeholder="Email"
-        formControlName="email" [ngClass]="{ 'input-error': formErrors['email'] }"
-      >
-      <div *ngIf="formErrors.email" class="form-error">
-        {{ formErrors.email }}
-      </div>
-    </div>
+      <div class="form-group form-group-terms">
+        <my-peertube-checkbox
+          inputName="terms" formControlName="terms"
+          i18n-labelHtml labelHtml="I have read and agree to the <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Terms</a> of this instance"
+        ></my-peertube-checkbox>
 
-    <div class="form-group">
-      <label for="password" i18n>Password</label>
-      <input
-        type="password" id="password" i18n-placeholder placeholder="Password"
-        formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }"
-      >
-      <div *ngIf="formErrors.password" class="form-error">
-        {{ formErrors.password }}
+        <div *ngIf="formErrors.terms" class="form-error">
+          {{ formErrors.terms }}
+        </div>
       </div>
-    </div>
 
-    <div class="form-group form-group-terms">
-      <my-peertube-checkbox
-        inputName="terms" formControlName="terms"
-        i18n-labelHtml labelHtml="I have read and agree to the <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Terms</a> of this instance"
-      ></my-peertube-checkbox>
+      <input type="submit" i18n-value value="Signup" [disabled]="!form.valid">
+    </form>
 
-      <div *ngIf="formErrors.terms" class="form-error">
-        {{ formErrors.terms }}
-      </div>
+    <div>
+      <label for="email" i18n>Features found on this instance</label>
+      <my-instance-features-table></my-instance-features-table>
     </div>
-
-    <input type="submit" i18n-value value="Signup" [disabled]="!form.valid">
-  </form>
+  </div>
 
 </div>
diff --git a/client/src/app/signup/signup.component.scss b/client/src/app/signup/signup.component.scss
index a98c3c732..90e1e8e74 100644
--- a/client/src/app/signup/signup.component.scss
+++ b/client/src/app/signup/signup.component.scss
@@ -7,6 +7,10 @@ my-instance-features-table {
   margin-bottom: 40px;
 }
 
+form {
+  margin: 0 60px 40px 0;
+}
+
 .form-group-terms {
   margin: 30px 0;
 }
@@ -15,6 +19,10 @@ my-instance-features-table {
   @include peertube-input-group(400px);
 }
 
+.input-group-append {
+  height: 30px;
+}
+
 input:not([type=submit]) {
   @include peertube-input-text(400px);
   display: block;