diff --git a/apps/browser/src/popup/accounts/environment.component.html b/apps/browser/src/popup/accounts/environment.component.html index 3b998d1703..ff19739548 100644 --- a/apps/browser/src/popup/accounts/environment.component.html +++ b/apps/browser/src/popup/accounts/environment.component.html @@ -36,13 +36,14 @@ id="baseUrl" type="text" name="BaseUrl" + aria-describedby="baseUrlHelp" [(ngModel)]="baseUrl" placeholder="ex. https://bitwarden.company.com" appInputVerbatim /> - @@ -50,7 +51,13 @@

{{ "customEnvironment" | i18n }}

-
+
- diff --git a/apps/browser/src/popup/accounts/hint.component.html b/apps/browser/src/popup/accounts/hint.component.html index 4f5f975ccf..c3d5ef3d8b 100644 --- a/apps/browser/src/popup/accounts/hint.component.html +++ b/apps/browser/src/popup/accounts/hint.component.html @@ -24,6 +24,7 @@ id="email" type="text" name="Email" + aria-describedby="emailHelp" [(ngModel)]="email" required appAutofocus @@ -32,7 +33,7 @@ />
- diff --git a/apps/browser/src/popup/accounts/lock.component.html b/apps/browser/src/popup/accounts/lock.component.html index 3c96458766..c5f4bfdf40 100644 --- a/apps/browser/src/popup/accounts/lock.component.html +++ b/apps/browser/src/popup/accounts/lock.component.html @@ -30,6 +30,7 @@ id="masterPassword" type="{{ showPassword ? 'text' : 'password' }}" name="MasterPassword" + aria-describedby="masterPasswordHelp" class="monospaced" [(ngModel)]="masterPassword" required @@ -54,7 +55,7 @@ - - @@ -100,10 +101,10 @@
- +
- diff --git a/apps/browser/src/popup/accounts/set-password.component.html b/apps/browser/src/popup/accounts/set-password.component.html index 9eb551bf26..656664facb 100644 --- a/apps/browser/src/popup/accounts/set-password.component.html +++ b/apps/browser/src/popup/accounts/set-password.component.html @@ -49,6 +49,7 @@ id="masterPassword" type="{{ showPassword ? 'text' : 'password' }}" name="MasterPassword" + aria-describedby="masterPasswordHelp" class="monospaced" [(ngModel)]="masterPassword" required @@ -82,7 +83,7 @@ - @@ -127,10 +128,16 @@
- +
- diff --git a/apps/browser/src/popup/accounts/update-temp-password.component.html b/apps/browser/src/popup/accounts/update-temp-password.component.html index 6fcbb76c3c..3dea8039cf 100644 --- a/apps/browser/src/popup/accounts/update-temp-password.component.html +++ b/apps/browser/src/popup/accounts/update-temp-password.component.html @@ -109,10 +109,10 @@
- +
- diff --git a/apps/browser/src/popup/components/password-reprompt.component.html b/apps/browser/src/popup/components/password-reprompt.component.html index ed69809735..730e96fab9 100644 --- a/apps/browser/src/popup/components/password-reprompt.component.html +++ b/apps/browser/src/popup/components/password-reprompt.component.html @@ -12,6 +12,7 @@ id="masterPassword" type="{{ showPassword ? 'text' : 'password' }}" name="MasterPassword" + aria-describedby="masterPasswordHelp" class="monospaced" [(ngModel)]="masterPassword" required @@ -36,7 +37,7 @@ - diff --git a/apps/browser/src/popup/components/user-verification.component.html b/apps/browser/src/popup/components/user-verification.component.html index 2fd78bb907..8d7f1ed870 100644 --- a/apps/browser/src/popup/components/user-verification.component.html +++ b/apps/browser/src/popup/components/user-verification.component.html @@ -5,6 +5,7 @@ id="masterPassword" type="password" name="MasterPasswordHash" + aria-describedby="confirmIdentityHelp" class="form-control" [formControl]="secret" required diff --git a/apps/browser/src/popup/generator/generator.component.html b/apps/browser/src/popup/generator/generator.component.html index 8178e35536..c6dc49772c 100644 --- a/apps/browser/src/popup/generator/generator.component.html +++ b/apps/browser/src/popup/generator/generator.component.html @@ -312,7 +312,9 @@ /> diff --git a/apps/browser/src/popup/send/efflux-dates.component.html b/apps/browser/src/popup/send/efflux-dates.component.html index 81fcf8f838..737fdae4aa 100644 --- a/apps/browser/src/popup/send/efflux-dates.component.html +++ b/apps/browser/src/popup/send/efflux-dates.component.html @@ -7,6 +7,7 @@ + - @@ -104,13 +112,14 @@ - - @@ -215,6 +225,7 @@ id="password" type="{{ showPassword ? 'text' : 'password' }}" name="Password" + aria-describedby="passwordHelp" class="monospaced" [(ngModel)]="password" appInputVerbatim @@ -239,7 +250,7 @@ - @@ -251,13 +262,14 @@ - diff --git a/apps/browser/src/popup/settings/export.component.html b/apps/browser/src/popup/settings/export.component.html index ebd0e03d6f..db072d6b50 100644 --- a/apps/browser/src/popup/settings/export.component.html +++ b/apps/browser/src/popup/settings/export.component.html @@ -32,7 +32,7 @@ - diff --git a/apps/browser/src/popup/settings/options.component.html b/apps/browser/src/popup/settings/options.component.html index afa77407f5..cdf8d93c0c 100644 --- a/apps/browser/src/popup/settings/options.component.html +++ b/apps/browser/src/popup/settings/options.component.html @@ -33,6 +33,7 @@ - +
@@ -49,6 +52,7 @@
- +
@@ -67,12 +71,13 @@
- +
@@ -81,12 +86,15 @@
- +
@@ -97,12 +105,15 @@
- +
@@ -111,12 +122,13 @@
- +
@@ -141,12 +153,15 @@
- +
@@ -155,12 +170,15 @@
- +
@@ -169,12 +187,13 @@
- +
@@ -183,23 +202,30 @@
- +
-
- +
@@ -224,12 +250,13 @@
- - diff --git a/apps/browser/src/popup/vault/share.component.html b/apps/browser/src/popup/vault/share.component.html index dcec42415c..46aaecd06b 100644 --- a/apps/browser/src/popup/vault/share.component.html +++ b/apps/browser/src/popup/vault/share.component.html @@ -35,6 +35,7 @@ - diff --git a/apps/desktop/src/app/accounts/accessibility-cookie.component.html b/apps/desktop/src/app/accounts/accessibility-cookie.component.html index fd52508eac..b5de1e766f 100644 --- a/apps/desktop/src/app/accounts/accessibility-cookie.component.html +++ b/apps/desktop/src/app/accounts/accessibility-cookie.component.html @@ -14,6 +14,7 @@ id="link" type="text" name="Link" + aria-describedby="linkHelp" formControlName="link" placeholder="{{ 'ex' | i18n }} https://accounts.hcaptcha.com/verify_email" appAutofocus @@ -21,7 +22,7 @@ /> - +
+ - @@ -34,7 +35,13 @@ {{ "customEnvironment" | i18n }} -
+
- diff --git a/apps/desktop/src/app/accounts/hint.component.html b/apps/desktop/src/app/accounts/hint.component.html index 3ab6088c94..a46479efee 100644 --- a/apps/desktop/src/app/accounts/hint.component.html +++ b/apps/desktop/src/app/accounts/hint.component.html @@ -9,6 +9,7 @@ id="email" type="text" name="Email" + aria-describedby="emailHelp" [(ngModel)]="email" required appAutofocus @@ -16,7 +17,7 @@ />
- diff --git a/apps/desktop/src/app/accounts/lock.component.html b/apps/desktop/src/app/accounts/lock.component.html index f5d8b36935..23adbff18c 100644 --- a/apps/desktop/src/app/accounts/lock.component.html +++ b/apps/desktop/src/app/accounts/lock.component.html @@ -23,6 +23,7 @@ id="masterPassword" type="{{ showPassword ? 'text' : 'password' }}" name="MasterPassword" + aria-describedby="masterPasswordHelp" class="monospaced" [(ngModel)]="masterPassword" required @@ -47,7 +48,7 @@ - diff --git a/apps/desktop/src/app/accounts/register.component.html b/apps/desktop/src/app/accounts/register.component.html index f270ceec1f..388c875131 100644 --- a/apps/desktop/src/app/accounts/register.component.html +++ b/apps/desktop/src/app/accounts/register.component.html @@ -26,6 +26,7 @@ id="masterPassword" type="{{ showPassword ? 'text' : 'password' }}" class="monospaced" + aria-describedby="masterPasswordHelp" formControlName="masterPassword" appInputVerbatim /> @@ -57,7 +58,7 @@ - @@ -93,7 +94,7 @@
- +
@@ -107,7 +108,7 @@
- diff --git a/apps/desktop/src/app/accounts/set-password.component.html b/apps/desktop/src/app/accounts/set-password.component.html index 4730e39e38..0a1522c45d 100644 --- a/apps/desktop/src/app/accounts/set-password.component.html +++ b/apps/desktop/src/app/accounts/set-password.component.html @@ -46,6 +46,7 @@ type="{{ showPassword ? 'text' : 'password' }}" name="MasterPassword" class="monospaced" + aria-describedby="masterPasswordHelp" [(ngModel)]="masterPassword" required appInputVerbatim @@ -77,7 +78,7 @@ - @@ -122,10 +123,16 @@
- +
- diff --git a/apps/desktop/src/app/accounts/settings.component.html b/apps/desktop/src/app/accounts/settings.component.html index 2e409f6fca..0a1ed59d3b 100644 --- a/apps/desktop/src/app/accounts/settings.component.html +++ b/apps/desktop/src/app/accounts/settings.component.html @@ -44,13 +44,16 @@ name="VaultTimeoutAction" id="vaultTimeoutActionLock" value="lock" + aria-describedby="vaultTimeoutActionLockHelp" [(ngModel)]="vaultTimeoutAction" (change)="saveVaultTimeoutOptions()" /> {{ "lock" | i18n }} - {{ "vaultTimeoutActionLockDesc" | i18n }} + {{ + "vaultTimeoutActionLockDesc" | i18n + }}
- {{ "vaultTimeoutActionLogOutDesc" | i18n }} + {{ + "vaultTimeoutActionLogOutDesc" | i18n + }}
@@ -139,6 +145,7 @@ - {{ "clearClipboardDesc" | i18n }} + {{ + "clearClipboardDesc" | i18n + }}
@@ -155,13 +164,16 @@ id="minimizeOnCopyToClipboard" type="checkbox" name="MinimizeOnCopyToClipboard" + aria-describedby="minimizeOnCopyToClipboardHelp" [(ngModel)]="minimizeOnCopyToClipboard" (change)="saveMinOnCopyToClipboard()" /> {{ "minimizeOnCopyToClipboard" | i18n }}
- {{ "minimizeOnCopyToClipboardDesc" | i18n }} + {{ + "minimizeOnCopyToClipboardDesc" | i18n + }}
@@ -170,13 +182,14 @@ id="enableFavicons" type="checkbox" name="enableFavicons" + aria-describedby="enableFaviconsHelp" [(ngModel)]="enableFavicons" (change)="saveFavicons()" /> {{ "enableFavicon" | i18n }}
- {{ "faviconDesc" | i18n }} + {{ "faviconDesc" | i18n }}
@@ -211,13 +224,14 @@ id="enableTray" type="checkbox" name="EnableTray" + aria-describedby="enableTrayHelp" [(ngModel)]="enableTray" (change)="saveTray()" /> {{ enableTrayText }} - {{ enableTrayDescText }} + {{ enableTrayDescText }}
@@ -226,13 +240,16 @@ id="enableMinToTray" type="checkbox" name="EnableMinToTray" + aria-describedby="enableMinToTrayHelp" [(ngModel)]="enableMinToTray" (change)="saveMinToTray()" /> {{ enableMinToTrayText }}
- {{ enableMinToTrayDescText }} + {{ + enableMinToTrayDescText + }}
@@ -241,13 +258,16 @@ id="enableCloseToTray" type="checkbox" name="EnableCloseToTray" + aria-describedby="enableCloseToTrayHelp" [(ngModel)]="enableCloseToTray" (change)="saveCloseToTray()" /> {{ enableCloseToTrayText }}
- {{ enableCloseToTrayDescText }} + {{ + enableCloseToTrayDescText + }}
@@ -256,13 +276,14 @@ id="startToTray" type="checkbox" name="StartToTray" + aria-describedby="startToTrayHelp" [(ngModel)]="startToTray" (change)="saveStartToTray()" /> {{ startToTrayText }}
- {{ startToTrayDescText }} + {{ startToTrayDescText }}
@@ -271,13 +292,16 @@ id="openAtLogin" type="checkbox" name="OpenAtLogin" + aria-describedby="openAtLoginHelp" [(ngModel)]="openAtLogin" (change)="saveOpenAtLogin()" /> {{ "openAtLogin" | i18n }}
- {{ "openAtLoginDesc" | i18n }} + {{ + "openAtLoginDesc" | i18n + }}
@@ -286,13 +310,16 @@ id="alwaysShowDock" type="checkbox" name="AlwaysShowDock" + aria-describedby="alwaysShowDockHelp" [(ngModel)]="alwaysShowDock" (change)="saveAlwaysShowDock()" /> {{ "alwaysShowDock" | i18n }}
- {{ "alwaysShowDockDesc" | i18n }} + {{ + "alwaysShowDockDesc" | i18n + }}
@@ -301,13 +328,16 @@ id="enableBrowserIntegration" type="checkbox" name="EnableBrowserIntegration" + aria-describedby="enableBrowserIntegrationHelp" [(ngModel)]="enableBrowserIntegration" (change)="saveBrowserIntegration()" /> {{ "enableBrowserIntegration" | i18n }}
- {{ "enableBrowserIntegrationDesc" | i18n }} + {{ + "enableBrowserIntegrationDesc" | i18n + }}
@@ -316,6 +346,7 @@ id="enableBrowserIntegrationFingerprint" type="checkbox" name="EnableBrowserIntegrationFingerprint" + aria-describedby="enableBrowserIntegrationFingerprintHelp" [(ngModel)]="enableBrowserIntegrationFingerprint" (change)="saveBrowserIntegrationFingerprint()" [disabled]="!enableBrowserIntegration" @@ -323,7 +354,7 @@ {{ "enableBrowserIntegrationFingerprint" | i18n }}
- {{ + {{ "enableBrowserIntegrationFingerprintDesc" | i18n }}
@@ -346,17 +377,29 @@
- - {{ "themeDesc" | i18n }} + {{ "themeDesc" | i18n }}
- - {{ "languageDesc" | i18n }} + {{ "languageDesc" | i18n }}
diff --git a/apps/desktop/src/app/accounts/update-temp-password.component.html b/apps/desktop/src/app/accounts/update-temp-password.component.html index 1bba7fcdc4..893257077a 100644 --- a/apps/desktop/src/app/accounts/update-temp-password.component.html +++ b/apps/desktop/src/app/accounts/update-temp-password.component.html @@ -96,10 +96,10 @@
- +
- diff --git a/apps/desktop/src/app/accounts/vault-timeout-input.component.html b/apps/desktop/src/app/accounts/vault-timeout-input.component.html index 62e5a104c1..21b10d4f73 100644 --- a/apps/desktop/src/app/accounts/vault-timeout-input.component.html +++ b/apps/desktop/src/app/accounts/vault-timeout-input.component.html @@ -8,12 +8,13 @@ - {{ "vaultTimeoutDesc" | i18n }} + {{ "vaultTimeoutDesc" | i18n }}
diff --git a/apps/desktop/src/app/components/password-reprompt.component.html b/apps/desktop/src/app/components/password-reprompt.component.html index 1ec4ef702c..1ff853c278 100644 --- a/apps/desktop/src/app/components/password-reprompt.component.html +++ b/apps/desktop/src/app/components/password-reprompt.component.html @@ -14,6 +14,7 @@ id="masterPassword" type="{{ showPassword ? 'text' : 'password' }}" name="MasterPassword" + aria-describedby="masterPasswordHelp" class="monospaced" [(ngModel)]="masterPassword" required @@ -38,7 +39,7 @@
- diff --git a/apps/desktop/src/app/components/user-verification.component.html b/apps/desktop/src/app/components/user-verification.component.html index 2fd78bb907..10b16a0408 100644 --- a/apps/desktop/src/app/components/user-verification.component.html +++ b/apps/desktop/src/app/components/user-verification.component.html @@ -5,6 +5,7 @@ id="masterPassword" type="password" name="MasterPasswordHash" + aria-describedby="confirmIdentityHelp" class="form-control" [formControl]="secret" required @@ -36,6 +37,7 @@ id="verificationCode" type="input" name="verificationCode" + aria-describedby="confirmIdentityHelp" class="form-control" [formControl]="secret" required diff --git a/apps/desktop/src/app/send/add-edit.component.html b/apps/desktop/src/app/send/add-edit.component.html index bae0e073da..e9e1b319ad 100644 --- a/apps/desktop/src/app/send/add-edit.component.html +++ b/apps/desktop/src/app/send/add-edit.component.html @@ -51,6 +51,7 @@ id="file" class="form-control-file" name="file" + aria-describedby="fileHelp" required [disabled]="disableSend" /> @@ -64,16 +65,17 @@ - - -

- {{ "notes" | i18n }} +

- diff --git a/apps/desktop/src/app/send/efflux-dates.component.html b/apps/desktop/src/app/send/efflux-dates.component.html index 37eacad9dc..156dfae9dd 100644 --- a/apps/desktop/src/app/send/efflux-dates.component.html +++ b/apps/desktop/src/app/send/efflux-dates.component.html @@ -6,12 +6,13 @@ - {{ "deletionDateDesc" | i18n }} + {{ "deletionDateDesc" | i18n }}
@@ -19,23 +20,27 @@ id="deletionDateCustom" type="datetime-local" name="deletionDate" + aria-describedby="deletionDateCustomHelp" formControlName="defaultDeletionDateTime" required placeholder="MM/DD/YYYY HH:MM AM/PM" /> - {{ "deletionDateDesc" | i18n }} + {{ + "deletionDateDesc" | i18n + }}
- {{ "expirationDateDesc" | i18n }} + {{ "expirationDateDesc" | i18n }}
@@ -43,11 +48,14 @@ id="expirationDateCustom" type="datetime-local" name="expirationDate" + aria-describedby="expirationDateCustomHelp" formControlName="defaultExpirationDateTime" required placeholder="MM/DD/YYYY HH:MM AM/PM" /> - {{ "expirationDateDesc" | i18n }} + {{ + "expirationDateDesc" | i18n + }}
diff --git a/apps/desktop/src/app/vault/attachments.component.html b/apps/desktop/src/app/vault/attachments.component.html index 0248d78b02..4931467b34 100644 --- a/apps/desktop/src/app/vault/attachments.component.html +++ b/apps/desktop/src/app/vault/attachments.component.html @@ -45,10 +45,10 @@
- +
- diff --git a/apps/desktop/src/app/vault/export.component.html b/apps/desktop/src/app/vault/export.component.html index 229156c1f6..8b3af4f1da 100644 --- a/apps/desktop/src/app/vault/export.component.html +++ b/apps/desktop/src/app/vault/export.component.html @@ -24,7 +24,7 @@ - diff --git a/apps/desktop/src/app/vault/generator.component.html b/apps/desktop/src/app/vault/generator.component.html index 28d7b37afe..4b8f16a91d 100644 --- a/apps/desktop/src/app/vault/generator.component.html +++ b/apps/desktop/src/app/vault/generator.component.html @@ -341,7 +341,7 @@ /> diff --git a/apps/desktop/src/app/vault/share.component.html b/apps/desktop/src/app/vault/share.component.html index 9232d08df3..a83cbb6629 100644 --- a/apps/desktop/src/app/vault/share.component.html +++ b/apps/desktop/src/app/vault/share.component.html @@ -18,6 +18,7 @@ - diff --git a/apps/desktop/src/scss/misc.scss b/apps/desktop/src/scss/misc.scss index 90988424b6..c5aabb5b07 100644 --- a/apps/desktop/src/scss/misc.scss +++ b/apps/desktop/src/scss/misc.scss @@ -361,31 +361,31 @@ form, margin-left: -18px; } } +} - .help-block { - margin-top: 3px; - display: block; +.help-block { + margin-top: 3px; + display: block; + + @include themify($themes) { + color: themed("mutedColor"); + } + + a { + @extend .btn; + @extend .link; + + padding: 0; + font-size: inherit; + font-weight: bold; @include themify($themes) { color: themed("mutedColor"); } - a { - @extend .btn; - @extend .link; - - padding: 0; - font-size: inherit; - font-weight: bold; - + &:hover { @include themify($themes) { - color: themed("mutedColor"); - } - - &:hover { - @include themify($themes) { - color: darken(themed("mutedColor"), 6%); - } + color: darken(themed("mutedColor"), 6%); } } }