Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SM-223] Web: change <h2> modal title to <h1>, tweak styles to keep same look #3328

Merged
merged 13 commits into from
Sep 20, 2022
Merged

[SM-223] Web: change <h2> modal title to <h1>, tweak styles to keep same look #3328

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
62c2d51
Web: change `<h2>` modal title to `<h1>`, tweak styles to keep same look
patrickhlauke Aug 17, 2022
a74a126
Merge branch 'master' into patrickhlauke-web-modal-headings
patrickhlauke Aug 18, 2022
8bb8a65
Merge branch 'master' into patrickhlauke-web-modal-headings
patrickhlauke Aug 18, 2022
41557bf
Change libs dialog component `<h2>` to `<h1>`
patrickhlauke Aug 18, 2022
3c4b8aa
Update simple-dialog component as well, add `role`/`aria-modal` to di…
patrickhlauke Aug 18, 2022
9e2069a
Merge branch 'master' into patrickhlauke-web-modal-headings
patrickhlauke Aug 29, 2022
eb1f571
Merge branch 'master' into patrickhlauke-web-modal-headings
patrickhlauke Aug 30, 2022
b051471
Merge branch 'master' into patrickhlauke-web-modal-headings
patrickhlauke Sep 4, 2022
6080658
Merge branch 'master' into patrickhlauke-web-modal-headings
patrickhlauke Sep 5, 2022
3ae95d2
Don't set `role`/`aria-modal` on the libs components
patrickhlauke Sep 5, 2022
05bb1c7
Pull in changes to libs dialog headings from #3439
patrickhlauke Sep 5, 2022
65f92ac
Merge branch 'master' into patrickhlauke-web-modal-headings
patrickhlauke Sep 8, 2022
cd4b678
Merge branch 'master' of github.com:bitwarden/clients into patrickhla…
Hinton Sep 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/web/src/app/accounts/two-factor-options.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="modal-dialog modal-dialog-scrollable modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h2 class="modal-title" id="twoStepOptionsTitle">{{ "twoStepOptions" | i18n }}</h2>
<h1 class="modal-title" id="twoStepOptionsTitle">{{ "twoStepOptions" | i18n }}</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/components/password-reprompt.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<div class="modal-dialog modal-dialog-scrollable" role="document">
<form class="modal-content" #form (ngSubmit)="submit()">
<div class="modal-header">
<h2 class="modal-title" id="confirmUserTitle">
<h1 class="modal-title" id="confirmUserTitle">
{{ "passwordConfirmation" | i18n }}
</h2>
</h1>
<button type="button" class="close" data-dismiss="modal">
<span aria-hidden="true">&times;</span>
</button>
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/organizations/manage/bulk/bulk-confirm.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<div class="modal-dialog modal-dialog-scrollable modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h2 class="modal-title" id="bulkTitle">
<h1 class="modal-title" id="bulkTitle">
{{ "confirmUsers" | i18n }}
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/organizations/manage/bulk/bulk-remove.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<div class="modal-dialog modal-dialog-scrollable modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h2 class="modal-title" id="bulkTitle">
<h1 class="modal-title" id="bulkTitle">
{{ "removeUsers" | i18n }}
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/organizations/manage/bulk/bulk-restore-revoke.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<div class="modal-dialog modal-dialog-scrollable modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h2 class="modal-title" id="bulkTitle">
<h1 class="modal-title" id="bulkTitle">
{{ bulkTitle }}
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/organizations/manage/bulk/bulk-status.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<div class="modal-dialog modal-dialog-scrollable modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h2 class="modal-title" id="bulkTitle">
<h1 class="modal-title" id="bulkTitle">
{{ "bulkConfirmStatus" | i18n }}
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/organizations/manage/collection-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
ngNativeValidate
>
<div class="modal-header">
<h2 class="modal-title" id="collectionAddEditTitle">{{ title }}</h2>
<h1 class="modal-title" id="collectionAddEditTitle">{{ title }}</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/organizations/manage/entity-events.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="modal-dialog modal-dialog-scrollable modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h2 class="modal-title" id="eventLogsTitle">
<h1 class="modal-title" id="eventLogsTitle">
{{ "eventLogs" | i18n }}
<small class="text-muted" *ngIf="name">{{ name }}</small>
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/organizations/manage/entity-users.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
ngNativeValidate
>
<div class="modal-header">
<h2 class="modal-title" id="userAccessTitle">
<h1 class="modal-title" id="userAccessTitle">
{{ "userAccess" | i18n }}
<small>{{ entityName }}</small>
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/organizations/manage/group-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
ngNativeValidate
>
<div class="modal-header">
<h2 class="modal-title" id="groupAddEditTitle">{{ title }}</h2>
<h1 class="modal-title" id="groupAddEditTitle">{{ title }}</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/organizations/manage/policy-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
ngNativeValidate
>
<div class="modal-header">
<h2 class="modal-title" id="policiesEditTitle">
<h1 class="modal-title" id="policiesEditTitle">
{{ "editPolicy" | i18n }} - {{ policy.name | i18n }}
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/organizations/manage/reset-password.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="modal-dialog" role="document">
<form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
<div class="modal-header">
<h2 class="modal-title" id="resetPasswordTitle">
<h1 class="modal-title" id="resetPasswordTitle">
{{ "resetPassword" | i18n }}
<small class="text-muted" *ngIf="name">{{ name }}</small>
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/organizations/manage/user-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
ngNativeValidate
>
<div class="modal-header">
<h2 class="modal-title" id="userAddEditTitle">
<h1 class="modal-title" id="userAddEditTitle">
{{ title }}
<small class="text-muted" *ngIf="name">{{ name }}</small>
<span bitBadge badgeType="secondary" *ngIf="isRevoked">{{ "revoked" | i18n }}</span>
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/organizations/manage/user-confirm.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="modal-dialog modal-dialog-scrollable" role="document">
<form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
<div class="modal-header">
<h2 class="modal-title" id="confirmUserTitle">
<h1 class="modal-title" id="confirmUserTitle">
{{ "confirmUser" | i18n }}
<small class="text-muted" *ngIf="name">{{ name }}</small>
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/organizations/manage/user-groups.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="modal-dialog modal-dialog-scrollable" role="document">
<form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
<div class="modal-header">
<h2 class="modal-title" id="groupAccessTitle">
<h1 class="modal-title" id="groupAccessTitle">
{{ "groupAccess" | i18n }}
<small class="text-muted" *ngIf="name">{{ name }}</small>
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/organizations/settings/billing-sync-api-key.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
ngNativeValidate
>
<div class="modal-header">
<h2 class="modal-title" id="billingSyncApiKeyTitle">
<h1 class="modal-title" id="billingSyncApiKeyTitle">
{{ (hasBillingToken ? "viewBillingSyncToken" : "generateBillingSyncToken") | i18n }}
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/organizations/settings/delete-organization.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*ngIf="loaded"
>
<div class="modal-header">
<h2 class="modal-title" id="deleteOrganizationTitle">{{ "deleteOrganization" | i18n }}</h2>
<h1 class="modal-title" id="deleteOrganizationTitle">{{ "deleteOrganization" | i18n }}</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/organizations/users/enroll-master-password-reset.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
ngNativeValidate
>
<div class="modal-header">
<h2 class="modal-title" id="enrollMasterPasswordResetTitle">
<h1 class="modal-title" id="enrollMasterPasswordResetTitle">
{{ "enrollPasswordReset" | i18n }}
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/send/add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
autocomplete="off"
>
<div class="modal-header">
<h2 class="modal-title" id="sendAddEditTitle">{{ title }}</h2>
<h1 class="modal-title" id="sendAddEditTitle">{{ title }}</h1>
<button
type="button"
class="close"
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/settings/api-key.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
ngNativeValidate
>
<div class="modal-header">
<h2 class="modal-title" id="apiKeyTitle">{{ apiKeyTitle | i18n }}</h2>
<h1 class="modal-title" id="apiKeyTitle">{{ apiKeyTitle | i18n }}</h1>
<button
type="button"
class="close"
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/settings/billing-sync-key.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
ngNativeValidate
>
<div class="modal-header">
<h2 class="modal-title" id="billingSyncTitle">{{ "manageBillingSync" | i18n }}</h2>
<h1 class="modal-title" id="billingSyncTitle">{{ "manageBillingSync" | i18n }}</h1>
<button
type="button"
class="close"
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/settings/deauthorize-sessions.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
ngNativeValidate
>
<div class="modal-header">
<h2 class="modal-title" id="deAuthTitle">{{ "deauthorizeSessions" | i18n }}</h2>
<h1 class="modal-title" id="deAuthTitle">{{ "deauthorizeSessions" | i18n }}</h1>
<button
type="button"
class="close"
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/settings/delete-account.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[formGroup]="deleteForm"
>
<div class="modal-header">
<h2 class="modal-title" id="deleteAccountTitle">{{ "deleteAccount" | i18n }}</h2>
<h1 class="modal-title" id="deleteAccountTitle">{{ "deleteAccount" | i18n }}</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/settings/emergency-access-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
ngNativeValidate
>
<div class="modal-header">
<h2 class="modal-title" id="userAddEditTitle">
<h1 class="modal-title" id="userAddEditTitle">
<app-premium-badge *ngIf="readOnly"></app-premium-badge>
{{ title }}
<small class="text-muted" *ngIf="name">{{ name }}</small>
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/settings/emergency-access-confirm.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="modal-dialog modal-dialog-scrollable" role="document">
<form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
<div class="modal-header">
<h2 class="modal-title" id="confirmUserTitle">
<h1 class="modal-title" id="confirmUserTitle">
{{ "confirmUser" | i18n }}
<small class="text-muted" *ngIf="name">{{ name }}</small>
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/settings/emergency-access-takeover.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
ngNativeValidate
>
<div class="modal-header">
<h2 class="modal-title" id="userAddEditTitle">
<h1 class="modal-title" id="userAddEditTitle">
{{ "takeover" | i18n }}
<small class="text-muted" *ngIf="name">{{ name }}</small>
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/settings/purge-vault.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
ngNativeValidate
>
<div class="modal-header">
<h2 class="modal-title" id="purgeVaultTitle">{{ "purgeVault" | i18n }}</h2>
<h1 class="modal-title" id="purgeVaultTitle">{{ "purgeVault" | i18n }}</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/settings/two-factor-authenticator.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h2 class="modal-title" id="2faAuthenticatorTitle">
<h1 class="modal-title" id="2faAuthenticatorTitle">
{{ "twoStepLogin" | i18n }}
<small>{{ "authenticatorAppTitle" | i18n }}</small>
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/settings/two-factor-duo.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h2 class="modal-title" id="2faDuoTitle">
<h1 class="modal-title" id="2faDuoTitle">
{{ "twoStepLogin" | i18n }}
<small>Duo</small>
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/settings/two-factor-email.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h2 class="modal-title" id="2faEmailTitle">
<h1 class="modal-title" id="2faEmailTitle">
{{ "twoStepLogin" | i18n }}
<small>{{ "emailTitle" | i18n }}</small>
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/settings/two-factor-recovery.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h2 class="modal-title" id="2faRecoveryTitle">
<h1 class="modal-title" id="2faRecoveryTitle">
{{ "twoStepLogin" | i18n }}
<small>{{ "recoveryCodeTitle" | i18n }}</small>
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/settings/two-factor-webauthn.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h2 class="modal-title" id="2faU2fTitle">
<h1 class="modal-title" id="2faU2fTitle">
{{ "twoStepLogin" | i18n }}
<small>{{ "webAuthnTitle" | i18n }}</small>
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/app/settings/two-factor-yubikey.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h2 class="modal-title" id="2faYubiKeyTitle">
<h1 class="modal-title" id="2faYubiKeyTitle">
{{ "twoStepLogin" | i18n }}
<small>YubiKey</small>
</h2>
</h1>
<button
type="button"
class="close"
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/settings/update-key.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
ngNativeValidate
>
<div class="modal-header">
<h2 class="modal-title" id="updateEncKeyTitle">{{ "updateEncryptionKey" | i18n }}</h2>
<h1 class="modal-title" id="updateEncKeyTitle">{{ "updateEncryptionKey" | i18n }}</h1>
<button
type="button"
class="close"
Expand Down