Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-24 11:55:50 +01:00
Code Issues Projects Releases Wiki Activity

Hide password input when using key connector (#1169)

Browse Source
This commit is contained in:
Oscar Hinton 2021-11-22 18:37:28 +01:00 committed by GitHub
parent 25b915cf26
commit b607a4ed08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit 8b01eea4467a8b1d411dab44d9a9b9a66a0ad341 Subproject commit f4c66b2c8c243935bf25f689b16afaa5d6345f1b

17
src/app/accounts/lock.component.html
View File

@ -1,10 +1,10 @@
<form id="lock-page" (ngSubmit)="submit()"> <form id="lock-page" (ngSubmit)="submit()">
<div class="content"> <div class="content">
<p aria-hidden="true"><i class="fa fa-lock fa-4x text-muted"></i></p> <p aria-hidden="true"><i class="fa fa-lock fa-4x text-muted"></i></p>
<p>{{(pinLock ? 'yourVaultIsLockedPinCode' : 'yourVaultIsLocked') | i18n}}</p> <p>{{'yourVaultIsLocked' | i18n}}</p>
<div class="box last"> <div class="box last">
<div class="box-content"> <div class="box-content">
<div class="box-content-row box-content-row-flex" appBoxRow> <div class="box-content-row box-content-row-flex" appBoxRow *ngIf="!hideInput">
<div class="row-main" *ngIf="pinLock"> <div class="row-main" *ngIf="pinLock">
<label for="pin">{{'pin' | i18n}}</label> <label for="pin">{{'pin' | i18n}}</label>
<input id="pin" type="{{showPassword ? 'text' : 'password'}}" name="PIN" class="monospaced" <input id="pin" type="{{showPassword ? 'text' : 'password'}}" name="PIN" class="monospaced"
@ -29,19 +29,20 @@
</div> </div>
</div> </div>
<div class="buttons with-rows"> <div class="buttons with-rows">
<div class="buttons-row" *ngIf="supportsBiometric && biometricLock">
<button type="button" class="btn block" [ngClass]="{'primary font-weight-bold': hideInput}"
appBlurClick (click)="unlockBiometric()">
{{biometricText | i18n}}
</button>
</div>
<div class="buttons-row"> <div class="buttons-row">
<button type="submit" class="btn primary block" appBlurClick> <button type="submit" class="btn primary block" appBlurClick *ngIf="!hideInput">
<i class="fa fa-unlock-alt" aria-hidden="true"></i> <b>{{'unlock' | i18n}}</b> <i class="fa fa-unlock-alt" aria-hidden="true"></i> <b>{{'unlock' | i18n}}</b>
</button> </button>
<button type="button" class="btn block" appBlurClick (click)="logOut()"> <button type="button" class="btn block" appBlurClick (click)="logOut()">
{{'logOut' | i18n}} {{'logOut' | i18n}}
</button> </button>
</div> </div>
<div class="buttons-row" *ngIf="supportsBiometric && biometricLock">
<button type="button" class="btn block" appBlurClick (click)="unlockBiometric()">
{{biometricText | i18n}}
</button>
</div>
</div> </div>
</div> </div>
</form> </form>

5
src/locales/en/messages.json
View File

@ -787,7 +787,7 @@
"message": "Syncing failed" "message": "Syncing failed"
}, },
"yourVaultIsLocked": { "yourVaultIsLocked": {
"message": "Your vault is locked. Verify your master password to continue." "message": "Your vault is locked. Verify your identity to continue."
}, },
"unlock": { "unlock": {
"message": "Unlock" "message": "Unlock"
@ -1315,9 +1315,6 @@
"invalidPin": { "invalidPin": {
"message": "Invalid PIN code." "message": "Invalid PIN code."
}, },
"yourVaultIsLockedPinCode": {
"message": "Your vault is locked. Verify your PIN code to continue."
},
"unlockWithWindowsHello": { "unlockWithWindowsHello": {
"message": "Unlock with Windows Hello" "message": "Unlock with Windows Hello"
}, },

4
src/scss/misc.scss
View File

@ -96,6 +96,10 @@ p.lead {
white-space: pre-wrap; white-space: pre-wrap;
} }
.font-weight-bold {
font-weight: bold;
}
.sr-only { .sr-only {
position: absolute !important; position: absolute !important;
width: 1px !important; width: 1px !important;