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
76 changes: 41 additions & 35 deletions src/app/login/login.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,54 +19,60 @@ <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>
<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>
<mat-form-field>
<p>Log in below or <a routerLink="/signup" [queryParams]="{ runbox7: 1 }" class="login-link">create a new account</a>.</p>
</div>
<div class="loginLinks">
<span id='runbox6' class="login-link">
<a href="https://runbox.com/mail">Runbox 6 Login</a>
</span>
<span id='norwegian' class="login-link">
<a href="https://runbox.no/mail">Norsk Login</a>
</span>
</div>

<mat-form-field>
<input matInput autocomplete="email" placeholder="Username" name="user" type="email" inputmode="email" autofocus ngModel required />
</mat-form-field>
<mat-form-field>
</mat-form-field>
<mat-form-field>
<input matInput autocomplete="current-password" placeholder="Password" type="password" name="password" ngModel required />
</mat-form-field>
<div *ngIf='login_error_html' [innerHTML]="login_error_html" class='login_error_html'></div>
<button [disabled]="loginForm.invalid" mat-raised-button color="primary" type="submit" id="loginButton">Log in</button>
<p *ngIf='accountSuspended' class='login_error_html'>
</mat-form-field>
<div *ngIf='login_error_html' [innerHTML]="login_error_html" class='login_error_html'></div>
<button [disabled]="loginForm.invalid" mat-raised-button color="primary" type="submit" id="loginButton">Log in</button>
<p *ngIf='accountSuspended' class='login_error_html'>
Your Runbox account has been suspended. <br>
Please contact <a href="https://support.runbox.com">Runbox Support</a>.
</p>
<p *ngIf='accountExpiredTrial' class='login_error_html'>
</p>
<p *ngIf='accountExpiredTrial' class='login_error_html'>
Your Runbox trial account has expired. <br>
Go to <a routerLink="/account/plans">Plans & Upgrades</a> to reopen it now!
</p>
<p *ngIf='accountExpiredSubscription' class='login_error_html'>
</p>
<p *ngIf='accountExpiredSubscription' class='login_error_html'>
Your Runbox subscription has expired. <br>
Go to <a routerLink="/account/subscriptions">Your Subscriptions</a> to renew it now!
</p>
<p *ngIf='accountCanceled' class='login_error_html'>
</p>
<p *ngIf='accountCanceled' class='login_error_html'>
Your Runbox subscription has been canceled. <br>
Please contact <a href="https://support.runbox.com">Runbox Support</a>.
</p>
<p *ngIf='accountClosed' class='login_error_html'>
</p>
<p *ngIf='accountClosed' class='login_error_html'>
This Runbox account has been closed. <br>
</p>
<p *ngIf='accountError' class='login_error_html'>
</p>
<p *ngIf='accountError' class='login_error_html'>
An unknown error has occurred. <br>
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><br />
<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='norwegian' class="login-link">
<a href="https://runbox.no/mail">Use Norwegian legacy webmail</a>
</div>
<div id='forgotPassword' class="login-link">
<a href="/pw_reset">Forgot password?</a>
</div>
<div id="progressBar">
<mat-progress-bar mode="indeterminate" *ngIf="progressService.httpRequestInProgress | async"></mat-progress-bar>
</div>
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>-->
</div>
<div id='forgotPassword' class="login-link">
<a href="/pw_reset">Forgot password?</a>
</div>
<div id="progressBar">
<mat-progress-bar mode="indeterminate" *ngIf="progressService.httpRequestInProgress | async"></mat-progress-bar>
</div>
</div>
</div>
</form>
Expand Down
71 changes: 43 additions & 28 deletions src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -498,31 +498,42 @@ div.loginScreen {
background-color: #fff;

a {
color: mat.get-color-from-palette($rmm-default-primary);
color: mat.get-color-from-palette($rmm-default-primary);
}

#loginArea {
border: 1px solid mat.get-color-from-palette($rmm-default-primary);
min-width: 300px;
min-height: 350px;
display: flex;
flex-flow: column;
align-items: center;
justify-content: center;
padding: 10px;
.loginLinks {
margin: 0 0 1em 0;
}
#runbox6, #norwegian {
margin: 0 0.5em;
font-size: 13px;
}

mat-form-field {
width: 200px;
}
#loginArea {
border: 1px solid mat.get-color-from-palette($rmm-default-primary);
min-width: 300px;
min-height: 350px;
display: flex;
flex-flow: column;
align-items: center;
justify-content: center;
padding: 10px;

mat-form-field {
width: 200px;
}
p {
margin: 0.5em;
}
}
#loginOptions {
display: flex;
margin: 0.5em;
margin: 0em;
font-size: 13px;

.mat-checkbox-label {
padding-top: 3px;
}
.mat-checkbox-label {
padding-top: 3px;
}
}
#loginButton {
width: 100px;
Expand All @@ -541,31 +552,35 @@ div.loginScreen {
width: 13px;
}
.login_error_html p {
margin: 0;
margin: 0;
}

.login_error_html a {
color: #f00 !important;
color: #f00 !important;
}

#progressBar {
position: absolute;
bottom: 0;
height: 5px;
width: 100%;
position: absolute;
bottom: 0;
height: 5px;
width: 100%;
}

.loginScreen #tfaArea {
border: 1px solid mat.get-color-from-palette($rmm-default-primary);
border: 1px solid mat.get-color-from-palette($rmm-default-primary);
}

mat-button-toggle button {
border-right: 1px solid #949494;
border-right: 1px solid #949494;
}

#forgotPassword, #createAccount, #norwegian {
margin: 0.5em;
font-size: 13px;
.login-checkbox {
margin: 0em;
padding: 0em;
}
#forgotPassword {
margin: 0.5em;
font-size: 14px;
}
}

Expand Down
Loading