Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions src/app/login/login.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ <h4 id="loginHeaderSubTitle">The fastest webmail app on the planet</h4>
<form *ngIf="!twofactor" (ngSubmit)="onSubmit(loginForm)" #loginForm="ngForm">
<div class="loginScreen">
<div id="loginArea">
<div>
<img src="assets/runbox7_blue_dark.png" id="logoLogin" alt="Runbox 7" />
<p>Log in below or <a routerLink="/signup" [queryParams]="{ runbox7: 1 }" class="login-link">create a new account</a>.</p>
</div>
<h2>Runbox Login</h2>
<div class="loginLinks">
<span id='runbox6' class="login-link">
<a href="https://runbox.com/mail">Runbox 6 Login</a>
Expand All @@ -31,7 +28,7 @@ <h4 id="loginHeaderSubTitle">The fastest webmail app on the planet</h4>
<a href="https://runbox.no/mail">Norsk Login</a>
</span>
</div>

<p>Log in below or <a routerLink="/signup" [queryParams]="{ runbox7: 1 }" class="login-link">create a new account</a>.</p>
<mat-form-field>
<input matInput autocomplete="email" placeholder="Username" name="user" type="email" inputmode="email" autofocus ngModel required />
</mat-form-field>
Expand Down Expand Up @@ -64,8 +61,8 @@ <h4 id="loginHeaderSubTitle">The fastest webmail app on the planet</h4>
Please contact <a href="https://support.runbox.com">Runbox Support</a>.
</p>
<div id="loginOptions">
<mat-checkbox name="is_keep_logged" class="login-checkbox" title="Stay logged into Runbox until logging out manually" ngModel>Stay logged in</mat-checkbox>
<!--<mat-checkbox name="is_use_rmm6" id="useRmm6" class="login-checkbox" title="Use Runbox 6, the previous version of Runbox" ngModel>Use Runbox 6</mat-checkbox>-->
<mat-checkbox name="is_keep_logged" class="login-checkbox" title="Stay logged into Runbox until logging out manually" ngModel>Stay logged in</mat-checkbox>&nbsp;
<mat-checkbox name="is_use_rmm6" id="useRmm6" class="login-checkbox" title="Use Runbox 6, the previous version of Runbox" ngModel>Use Runbox 6</mat-checkbox>
</div>
<div id='forgotPassword' class="login-link">
<a href="/pw_reset">Forgot password?</a>
Expand All @@ -80,10 +77,7 @@ <h4 id="loginHeaderSubTitle">The fastest webmail app on the planet</h4>
<div class="loginScreen">
<div id="tfaArea">
<mat-card style="max-width: 90vw">
<div>
<img src="assets/runbox7_blue_dark.png" id="logoLogin" alt="Runbox 7" />
</div>
<div *ngIf='login_error_html' [innerHTML]="login_error_html" class='login_error_html'></div>
<div *ngIf='login_error_html' [innerHTML]="login_error_html" class='login_error_html'></div>
<mat-card-title><h3>Two-Factor Authentication</h3></mat-card-title>
<mat-card-content>
<ng-container *ngIf="!twofactormethodgroup.value">
Expand Down
9 changes: 6 additions & 3 deletions src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -502,11 +502,11 @@ div.loginScreen {
}

.loginLinks {
margin: 0 0 1em 0;
margin: 0.5em 0;
}
#runbox6, #norwegian {
margin: 0 0.5em;
font-size: 13px;
font-size: 15px;
}

#loginArea {
Expand All @@ -522,8 +522,11 @@ div.loginScreen {
mat-form-field {
width: 200px;
}
h2 {
margin: 0;
}
p {
margin: 0.5em;
margin: 0 0 1em 0;
}
}
#loginOptions {
Expand Down
Loading