mirror of
https://github.com/bitwarden/browser
synced 2025-12-16 16:23:44 +00:00
minor formatting for consistency
This commit is contained in:
@@ -20,32 +20,27 @@
|
|||||||
<!-----------------------------
|
<!-----------------------------
|
||||||
Web UI State 1: Email Entry
|
Web UI State 1: Email Entry
|
||||||
------------------------------>
|
------------------------------>
|
||||||
|
<!-- TODO-rr-bw: consider refactoring this *ngIf check to something like LoginState.EmailEntry and LoginState.MasterPasswordEntry -->
|
||||||
<ng-container *ngIf="!validatedEmail">
|
<ng-container *ngIf="!validatedEmail">
|
||||||
<!-- Email Address input -->
|
<!-- Email Address input -->
|
||||||
<div class="tw-mb-3">
|
<div class="tw-mb-3">
|
||||||
<bit-form-field>
|
<bit-form-field>
|
||||||
<bit-label>{{ "emailAddress" | i18n }}</bit-label>
|
<bit-label>{{ "emailAddress" | i18n }}</bit-label>
|
||||||
<input type="email" bitInput formControlName="email" appAutofocus />
|
<input type="email" formControlName="email" bitInput appAutofocus />
|
||||||
</bit-form-field>
|
</bit-form-field>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Remember Email input -->
|
<!-- Remember Email input -->
|
||||||
<div class="tw-mb-3 tw-flex tw-items-start">
|
<div class="tw-mb-3 tw-flex tw-items-start">
|
||||||
<bit-form-control class="tw-mb-0">
|
<bit-form-control class="tw-mb-0">
|
||||||
<input type="checkbox" bitCheckbox formControlName="rememberEmail" />
|
<input type="checkbox" formControlName="rememberEmail" bitCheckbox />
|
||||||
<bit-label>{{ "rememberEmail" | i18n }}</bit-label>
|
<bit-label>{{ "rememberEmail" | i18n }}</bit-label>
|
||||||
</bit-form-control>
|
</bit-form-control>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Continue button -->
|
<!-- Continue button -->
|
||||||
<div class="tw-mb-3">
|
<div class="tw-mb-3">
|
||||||
<button
|
<button type="submit" bitButton block buttonType="primary" (click)="validateEmail()">
|
||||||
bitButton
|
|
||||||
type="submit"
|
|
||||||
buttonType="primary"
|
|
||||||
class="tw-w-full"
|
|
||||||
(click)="validateEmail()"
|
|
||||||
>
|
|
||||||
<span> {{ "continue" | i18n }} </span>
|
<span> {{ "continue" | i18n }} </span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -99,8 +94,8 @@
|
|||||||
<!-- Master Password input -->
|
<!-- Master Password input -->
|
||||||
<bit-form-field class="!tw-mb-1">
|
<bit-form-field class="!tw-mb-1">
|
||||||
<bit-label>{{ "masterPass" | i18n }}</bit-label>
|
<bit-label>{{ "masterPass" | i18n }}</bit-label>
|
||||||
<input type="password" bitInput #masterPasswordInput formControlName="masterPassword" />
|
<input type="password" formControlName="masterPassword" bitInput #masterPasswordInput />
|
||||||
<button type="button" bitSuffix bitIconButton bitPasswordInputToggle></button>
|
<button type="button" bitIconButton bitSuffix bitPasswordInputToggle></button>
|
||||||
</bit-form-field>
|
</bit-form-field>
|
||||||
|
|
||||||
<!-- Link to Password Hint page -->
|
<!-- Link to Password Hint page -->
|
||||||
@@ -120,31 +115,31 @@
|
|||||||
|
|
||||||
<!-- Button to Login with Master Password -->
|
<!-- Button to Login with Master Password -->
|
||||||
<div class="tw-mb-3 tw-flex tw-space-x-4">
|
<div class="tw-mb-3 tw-flex tw-space-x-4">
|
||||||
<button bitButton buttonType="primary" bitFormButton type="submit" [block]="true">
|
<button type="submit" bitButton bitFormButton block buttonType="primary">
|
||||||
<span> {{ "loginWithMasterPassword" | i18n }} </span>
|
<span> {{ "loginWithMasterPassword" | i18n }} </span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="tw-mb-3" *ngIf="showLoginWithDevice && showPasswordless">
|
<div class="tw-mb-3" *ngIf="showLoginWithDevice && showPasswordless">
|
||||||
<button
|
<button
|
||||||
bitButton
|
|
||||||
type="button"
|
type="button"
|
||||||
[block]="true"
|
bitButton
|
||||||
|
block
|
||||||
buttonType="secondary"
|
buttonType="secondary"
|
||||||
(click)="startAuthRequestLogin()"
|
(click)="startAuthRequestLogin()"
|
||||||
>
|
>
|
||||||
<span> <i class="bwi bwi-mobile"></i> {{ "loginWithDevice" | i18n }} </span>
|
<span><i class="bwi bwi-mobile"></i> {{ "loginWithDevice" | i18n }}</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="tw-mb-3">
|
<div class="tw-mb-3">
|
||||||
<a
|
<a
|
||||||
|
bitButton
|
||||||
|
block
|
||||||
|
buttonType="secondary"
|
||||||
routerLink="/sso"
|
routerLink="/sso"
|
||||||
[queryParams]="{ email: formGroup.value.email }"
|
[queryParams]="{ email: formGroup.value.email }"
|
||||||
(click)="saveEmailSettings()"
|
(click)="saveEmailSettings()"
|
||||||
bitButton
|
|
||||||
buttonType="secondary"
|
|
||||||
class="tw-w-full"
|
|
||||||
>
|
>
|
||||||
<i class="bwi bwi-provider tw-mr-2"></i>
|
<i class="bwi bwi-provider tw-mr-2"></i>
|
||||||
{{ "enterpriseSingleSignOn" | i18n }}
|
{{ "enterpriseSingleSignOn" | i18n }}
|
||||||
@@ -179,35 +174,33 @@
|
|||||||
<!-- Email Address input -->
|
<!-- Email Address input -->
|
||||||
<bit-form-field>
|
<bit-form-field>
|
||||||
<bit-label>{{ "emailAddress" | i18n }}</bit-label>
|
<bit-label>{{ "emailAddress" | i18n }}</bit-label>
|
||||||
<input type="email" bitInput formControlName="email" appAutofocus />
|
<input type="email" formControlName="email" bitInput appAutofocus />
|
||||||
</bit-form-field>
|
</bit-form-field>
|
||||||
|
|
||||||
<!-- Remember Email input -->
|
<!-- Remember Email input -->
|
||||||
<bit-form-control>
|
<bit-form-control>
|
||||||
<input type="checkbox" bitCheckbox formControlName="rememberEmail" />
|
<input type="checkbox" formControlName="rememberEmail" bitCheckbox />
|
||||||
<bit-label>{{ "rememberEmail" | i18n }}</bit-label>
|
<bit-label>{{ "rememberEmail" | i18n }}</bit-label>
|
||||||
</bit-form-control>
|
</bit-form-control>
|
||||||
|
|
||||||
<div class="tw-grid tw-gap-3">
|
<div class="tw-grid tw-gap-3">
|
||||||
<!-- Continue button -->
|
<!-- Continue button -->
|
||||||
<button bitButton type="submit" buttonType="primary" (click)="validateEmail()">
|
<button type="submit" bitButton buttonType="primary" (click)="validateEmail()">
|
||||||
<span> {{ "continue" | i18n }} </span>
|
<span> {{ "continue" | i18n }} </span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div class="tw-text-center">{{ "or" | i18n }}</div>
|
<div class="tw-text-center">{{ "or" | i18n }}</div>
|
||||||
|
|
||||||
<!-- Link to Login with Passkey page -->
|
<!-- Link to Login with Passkey page -->
|
||||||
<button type="button" bitButton buttonType="secondary" block routerLink="/login-with-passkey">
|
<button type="button" bitButton block buttonType="secondary" routerLink="/login-with-passkey">
|
||||||
<span><i class="bwi bwi-passkey"></i> {{ "logInWithPasskey" | i18n }}</span>
|
<span><i class="bwi bwi-passkey"></i> {{ "logInWithPasskey" | i18n }}</span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<!-- Link to SSO page -->
|
<!-- Link to SSO page -->
|
||||||
<button type="button" bitButton buttonType="secondary" block routerLink="/sso">
|
<button type="button" bitButton block buttonType="secondary" routerLink="/sso">
|
||||||
<span><i class="bwi bwi-provider"></i> {{ "useSingleSignOn" | i18n }}</span>
|
<span><i class="bwi bwi-provider"></i> {{ "useSingleSignOn" | i18n }}</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- TODO-rr-bw: add "New to Bitwarden? Create Account (might need to be AnonLayout secondary content)" -->
|
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<!-------------------------------------------
|
<!-------------------------------------------
|
||||||
|
|||||||
@@ -211,7 +211,7 @@ export class LoginComponentV2 implements OnInit, OnDestroy {
|
|||||||
|
|
||||||
// ...on Browser/Desktop
|
// ...on Browser/Desktop
|
||||||
} else {
|
} else {
|
||||||
await this.syncService.fullSync(true); // TODO-rr-bw: browser used `await`, desktop used `return`. Why?
|
await this.syncService.fullSync(true); // TODO-rr-bw: browser used `await`, desktop used `return`. Why? Does it matter?
|
||||||
this.loginEmailService.clearValues();
|
this.loginEmailService.clearValues();
|
||||||
|
|
||||||
if (this.clientType === ClientType.Browser) {
|
if (this.clientType === ClientType.Browser) {
|
||||||
|
|||||||
Reference in New Issue
Block a user