diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts index 8d190e4555..dd1d1574b2 100644 --- a/apps/browser/src/popup/app-routing.module.ts +++ b/apps/browser/src/popup/app-routing.module.ts @@ -17,10 +17,9 @@ import { SetInitialPasswordComponent } from "@bitwarden/angular/auth/password-ma import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard"; import { DevicesIcon, - RegistrationLockAltIcon, RegistrationUserAddIcon, TwoFactorTimeoutIcon, - DeviceVerificationIcon, + TwoFactorAuthEmailIcon, UserLockIcon, VaultIcon, LockIcon, @@ -165,7 +164,7 @@ const routes: Routes = [ canActivate: [unauthGuardFn(), activeAuthGuard()], children: [{ path: "", component: NewDeviceVerificationComponent }], data: { - pageIcon: DeviceVerificationIcon, + pageIcon: TwoFactorAuthEmailIcon, pageTitle: { key: "verifyYourIdentity", }, @@ -362,7 +361,7 @@ const routes: Routes = [ path: "finish-signup", canActivate: [unauthGuardFn()], data: { - pageIcon: RegistrationLockAltIcon, + pageIcon: LockIcon, elevation: 1, showBackButton: true, } satisfies RouteDataProperties & ExtensionAnonLayoutWrapperData, diff --git a/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.html b/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.html index af3abbf542..f0d66bd49e 100644 --- a/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.html +++ b/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.html @@ -14,7 +14,9 @@
- +
+ +

{{ "createdSendSuccessfully" | i18n }}

diff --git a/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.html b/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.html index ff7bf25b86..5f19092d6b 100644 --- a/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.html +++ b/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.html @@ -1,28 +1,36 @@
- +
+ +

{{ "securityPrioritized" | i18n }}

{{ "securityPrioritizedBody" | i18n }}
- +
+ +

{{ "quickLogin" | i18n }}

{{ "quickLoginBody" | i18n }}
- +
+ +

{{ "secureUser" | i18n }}

{{ "secureUserBody" | i18n }}
- +
+ +

{{ "secureDevices" | i18n }}

{{ "secureDevicesBody" | i18n }}

diff --git a/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts b/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts index 22149f9dc8..94996a054e 100644 --- a/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts +++ b/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts @@ -2,7 +2,7 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; import { JslibModule } from "@bitwarden/angular/jslib.module"; -import { SecurityHandshake, LoginCards, SecureUser, SecureDevices } from "@bitwarden/assets/svg"; +import { ItemTypes, LoginCards, NoCredentialsIcon, DevicesIcon } from "@bitwarden/assets/svg"; import { ButtonModule, DialogModule, IconModule, TypographyModule } from "@bitwarden/components"; import { I18nPipe } from "@bitwarden/ui-common"; import { VaultCarouselModule } from "@bitwarden/vault"; @@ -23,10 +23,10 @@ import { IntroCarouselService } from "../../../services/intro-carousel.service"; ], }) export class IntroCarouselComponent { - protected securityHandshake = SecurityHandshake; + protected itemTypes = ItemTypes; protected loginCards = LoginCards; - protected secureUser = SecureUser; - protected secureDevices = SecureDevices; + protected noCredentials = NoCredentialsIcon; + protected secureDevices = DevicesIcon; constructor( private router: Router, diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts index 675aec95ac..b07c1c0871 100644 --- a/apps/desktop/src/app/app-routing.module.ts +++ b/apps/desktop/src/app/app-routing.module.ts @@ -15,10 +15,9 @@ import { ChangePasswordComponent } from "@bitwarden/angular/auth/password-manage import { SetInitialPasswordComponent } from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.component"; import { DevicesIcon, - RegistrationLockAltIcon, RegistrationUserAddIcon, TwoFactorTimeoutIcon, - DeviceVerificationIcon, + TwoFactorAuthEmailIcon, UserLockIcon, VaultIcon, LockIcon, @@ -86,7 +85,7 @@ const routes: Routes = [ canActivate: [unauthGuardFn(), activeAuthGuard()], children: [{ path: "", component: NewDeviceVerificationComponent }], data: { - pageIcon: DeviceVerificationIcon, + pageIcon: TwoFactorAuthEmailIcon, pageTitle: { key: "verifyYourIdentity", }, @@ -150,7 +149,7 @@ const routes: Routes = [ path: "finish-signup", canActivate: [unauthGuardFn()], data: { - pageIcon: RegistrationLockAltIcon, + pageIcon: LockIcon, } satisfies AnonLayoutWrapperData, children: [ { diff --git a/apps/web/src/app/admin-console/organizations/collections/deprecated_vault.component.ts b/apps/web/src/app/admin-console/organizations/collections/deprecated_vault.component.ts index 42900a0b94..abd53c0990 100644 --- a/apps/web/src/app/admin-console/organizations/collections/deprecated_vault.component.ts +++ b/apps/web/src/app/admin-console/organizations/collections/deprecated_vault.component.ts @@ -34,7 +34,7 @@ import { Unassigned, } from "@bitwarden/admin-console/common"; import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe"; -import { Search } from "@bitwarden/assets/svg"; +import { NoResults } from "@bitwarden/assets/svg"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; @@ -170,7 +170,7 @@ export class VaultComponent implements OnInit, OnDestroy { activeFilter: VaultFilter = new VaultFilter(); protected showAddAccessToggle = false; - protected noItemIcon = Search; + protected noItemIcon = NoResults; protected performingInitialLoad = true; protected refreshing = false; protected processingEvent = false; diff --git a/apps/web/src/app/admin-console/organizations/collections/vault.component.ts b/apps/web/src/app/admin-console/organizations/collections/vault.component.ts index 3c389a0540..63b1cabff7 100644 --- a/apps/web/src/app/admin-console/organizations/collections/vault.component.ts +++ b/apps/web/src/app/admin-console/organizations/collections/vault.component.ts @@ -36,7 +36,7 @@ import { Unassigned, } from "@bitwarden/admin-console/common"; import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe"; -import { Search } from "@bitwarden/assets/svg"; +import { NoResults } from "@bitwarden/assets/svg"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; @@ -183,7 +183,7 @@ export class vNextVaultComponent implements OnInit, OnDestroy { activeFilter: VaultFilter = new VaultFilter(); protected showAddAccessToggle = false; - protected noItemIcon = Search; + protected noItemIcon = NoResults; protected loading$: Observable; protected processingEvent$ = new BehaviorSubject(false); protected organization$: Observable; diff --git a/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.html b/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.html index 07bd855fdf..94dfac4297 100644 --- a/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.html +++ b/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.html @@ -12,7 +12,9 @@ >
- +
+ +

{{ "readingPasskeyLoadingInfo" | i18n }}

diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts index 35e5048b1a..04b148e8a0 100644 --- a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts +++ b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts @@ -4,7 +4,10 @@ import { Component, OnInit } from "@angular/core"; import { FormBuilder, Validators } from "@angular/forms"; import { firstValueFrom, map, Observable } from "rxjs"; -import { CreatePasskeyFailedIcon, CreatePasskeyIcon } from "@bitwarden/assets/svg"; +import { + TwoFactorAuthSecurityKeyFailedIcon, + TwoFactorAuthSecurityKeyIcon, +} from "@bitwarden/assets/svg"; import { PrfKeySet } from "@bitwarden/auth/common"; import { Verification } from "@bitwarden/common/auth/types/verification"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; @@ -37,8 +40,8 @@ export class CreateCredentialDialogComponent implements OnInit { protected readonly NameMaxCharacters = 50; protected readonly CreateCredentialDialogResult = CreateCredentialDialogResult; protected readonly Icons = { - CreatePasskeyIcon, - CreatePasskeyFailedIcon, + TwoFactorAuthSecurityKeyIcon, + TwoFactorAuthSecurityKeyFailedIcon, }; protected currentStep: Step = "userVerification"; diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html index 3b3e08764f..5fa10c4c87 100644 --- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html +++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html @@ -238,7 +238,9 @@
- +
+ +

{{ "billingManagedByProvider" | i18n: userOrg.providerName }}

{{ "billingContactProviderForAssistance" | i18n }}

diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts index 509fecb88f..6bb262152e 100644 --- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts +++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts @@ -5,7 +5,7 @@ import { ActivatedRoute } from "@angular/router"; import { firstValueFrom, lastValueFrom, Subject } from "rxjs"; import { OrganizationUserApiService } from "@bitwarden/admin-console/common"; -import { SubscriptionHiddenIcon } from "@bitwarden/assets/svg"; +import { GearIcon } from "@bitwarden/assets/svg"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { @@ -66,7 +66,7 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy organizationIsManagedByConsolidatedBillingMSP = false; resellerSeatsRemainingMessage: string; - protected readonly subscriptionHiddenIcon = SubscriptionHiddenIcon; + protected readonly gearIcon = GearIcon; protected readonly teamsStarter = ProductTierType.TeamsStarter; private destroy$ = new Subject(); diff --git a/apps/web/src/app/billing/organizations/subscription-hidden.component.ts b/apps/web/src/app/billing/organizations/subscription-hidden.component.ts index f68b20635b..cca12e938d 100644 --- a/apps/web/src/app/billing/organizations/subscription-hidden.component.ts +++ b/apps/web/src/app/billing/organizations/subscription-hidden.component.ts @@ -2,12 +2,14 @@ // @ts-strict-ignore import { Component, Input } from "@angular/core"; -import { SubscriptionHiddenIcon } from "@bitwarden/assets/svg"; +import { GearIcon } from "@bitwarden/assets/svg"; @Component({ selector: "app-org-subscription-hidden", template: `
- +
+ +

{{ "billingManagedByProvider" | i18n: providerName }}

{{ "billingContactProviderForAssistance" | i18n }}

`, @@ -15,5 +17,5 @@ import { SubscriptionHiddenIcon } from "@bitwarden/assets/svg"; }) export class SubscriptionHiddenComponent { @Input() providerName: string; - subscriptionHiddenIcon = SubscriptionHiddenIcon; + gearIcon = GearIcon; } diff --git a/apps/web/src/app/dirt/reports/reports.ts b/apps/web/src/app/dirt/reports/reports.ts index d743738296..eb24f78002 100644 --- a/apps/web/src/app/dirt/reports/reports.ts +++ b/apps/web/src/app/dirt/reports/reports.ts @@ -1,11 +1,11 @@ import { - MemberAccess, + NoCredentialsIcon, ReportBreach, ReportExposedPasswords, - ReportInactiveTwoFactor, - ReportReusedPasswords, ReportUnsecuredWebsites, - ReportWeakPasswords, + TwoFactorAuthSecurityKeyFailedIcon, + UnlockedIcon, + UserLockIcon, } from "@bitwarden/assets/svg"; import { ReportEntry } from "./shared"; @@ -35,13 +35,13 @@ export const reports: Record = { title: "reusedPasswordsReport", description: "reusedPasswordsReportDesc", route: "reused-passwords-report", - icon: ReportReusedPasswords, + icon: NoCredentialsIcon, }, [ReportType.WeakPasswords]: { title: "weakPasswordsReport", description: "weakPasswordsReportDesc", route: "weak-passwords-report", - icon: ReportWeakPasswords, + icon: UnlockedIcon, }, [ReportType.UnsecuredWebsites]: { title: "unsecuredWebsitesReport", @@ -53,7 +53,7 @@ export const reports: Record = { title: "inactive2faReport", description: "inactive2faReportDesc", route: "inactive-two-factor-report", - icon: ReportInactiveTwoFactor, + icon: TwoFactorAuthSecurityKeyFailedIcon, }, [ReportType.DataBreach]: { title: "dataBreachReport", @@ -65,6 +65,6 @@ export const reports: Record = { title: "memberAccessReport", description: "memberAccessReportDesc", route: "member-access-report", - icon: MemberAccess, + icon: UserLockIcon, }, }; diff --git a/apps/web/src/app/dirt/reports/shared/report-card/report-card.component.html b/apps/web/src/app/dirt/reports/shared/report-card/report-card.component.html index 5553daf6e7..8db0db3b5e 100644 --- a/apps/web/src/app/dirt/reports/shared/report-card/report-card.component.html +++ b/apps/web/src/app/dirt/reports/shared/report-card/report-card.component.html @@ -7,7 +7,9 @@ class="tw-flex tw-h-28 tw-bg-background-alt2 tw-text-center tw-text-primary-300" [ngClass]="{ 'tw-grayscale': disabled }" > -
+
+ +

{{ title }}

diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index c0b1f9d162..9ac628752b 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -14,13 +14,11 @@ import { ChangePasswordComponent } from "@bitwarden/angular/auth/password-manage import { SetInitialPasswordComponent } from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.component"; import { DevicesIcon, - RegistrationLockAltIcon, RegistrationUserAddIcon, TwoFactorTimeoutIcon, - DeviceVerificationIcon, + TwoFactorAuthEmailIcon, UserLockIcon, VaultIcon, - RegistrationExpiredLinkIcon, SsoKeyIcon, LockIcon, BrowserExtensionIcon, @@ -171,7 +169,7 @@ const routes: Routes = [ path: "finish-signup", canActivate: [unauthGuardFn()], data: { - pageIcon: RegistrationLockAltIcon, + pageIcon: LockIcon, titleId: "setAStrongPassword", } satisfies RouteDataProperties & AnonLayoutWrapperData, children: [ @@ -304,7 +302,7 @@ const routes: Routes = [ path: "signup-link-expired", canActivate: [unauthGuardFn()], data: { - pageIcon: RegistrationExpiredLinkIcon, + pageIcon: TwoFactorTimeoutIcon, pageTitle: { key: "expiredLink", }, @@ -435,7 +433,7 @@ const routes: Routes = [ }, ], data: { - pageIcon: DeviceVerificationIcon, + pageIcon: TwoFactorAuthEmailIcon, pageTitle: { key: "verifyYourIdentity", }, diff --git a/apps/web/src/app/shared/shared.module.ts b/apps/web/src/app/shared/shared.module.ts index efb4bb98be..6012e4867e 100644 --- a/apps/web/src/app/shared/shared.module.ts +++ b/apps/web/src/app/shared/shared.module.ts @@ -22,6 +22,7 @@ import { LinkModule, MenuModule, MultiSelectModule, + NoItemsModule, ProgressModule, RadioButtonModule, SectionComponent, @@ -66,6 +67,7 @@ import { LinkModule, MenuModule, MultiSelectModule, + NoItemsModule, ProgressModule, RadioButtonModule, SectionComponent, @@ -101,6 +103,7 @@ import { LinkModule, MenuModule, MultiSelectModule, + NoItemsModule, ProgressModule, RadioButtonModule, SectionComponent, diff --git a/apps/web/src/app/tools/send/send-access/access.component.html b/apps/web/src/app/tools/send/send-access/access.component.html index 2a7514ed85..16c1fcf074 100644 --- a/apps/web/src/app/tools/send/send-access/access.component.html +++ b/apps/web/src/app/tools/send/send-access/access.component.html @@ -11,10 +11,10 @@ (setPasswordEvent)="setPassword($event)" *ngIf="passwordRequired && !error" > - + {{ "sendAccessUnavailable" | i18n }} - + {{ "unexpectedErrorSend" | i18n }}
diff --git a/apps/web/src/app/tools/send/send-access/access.component.ts b/apps/web/src/app/tools/send/send-access/access.component.ts index 1636ac37b8..a21644da92 100644 --- a/apps/web/src/app/tools/send/send-access/access.component.ts +++ b/apps/web/src/app/tools/send/send-access/access.component.ts @@ -4,7 +4,7 @@ import { Component, OnInit } from "@angular/core"; import { FormBuilder } from "@angular/forms"; import { ActivatedRoute } from "@angular/router"; -import { ExpiredSendIcon } from "@bitwarden/assets/svg"; +import { ActiveSendIcon } from "@bitwarden/assets/svg"; import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -49,7 +49,7 @@ export class AccessComponent implements OnInit { protected hideEmail = false; protected decKey: SymmetricCryptoKey; protected accessRequest: SendAccessRequest; - protected expiredSendIcon = ExpiredSendIcon; + protected sendIcon = ActiveSendIcon; protected formGroup = this.formBuilder.group({}); diff --git a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.html b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.html index ac24383a4d..41ee1b4707 100644 --- a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.html +++ b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.html @@ -30,7 +30,9 @@
- +
+ +

{{ "bitwardenExtensionInstalled" | i18n }}

{{ "loading" | i18n }}
-
- -

{{ "noItemsInList" | i18n }}

- +
+ +
{{ "noItemsInList" | i18n }}
+ +
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts index e27847d526..e2420631c1 100644 --- a/apps/web/src/app/vault/individual-vault/vault.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault.component.ts @@ -35,7 +35,7 @@ import { Unassigned, } from "@bitwarden/admin-console/common"; import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe"; -import { Search } from "@bitwarden/assets/svg"; +import { NoResults } from "@bitwarden/assets/svg"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; @@ -165,7 +165,7 @@ export class VaultComponent implements OnInit, OnDestr kdfIterations: number; activeFilter: VaultFilter = new VaultFilter(); - protected noItemIcon = Search; + protected noItemIcon = NoResults; protected performingInitialLoad = true; protected refreshing = false; protected processingEvent = false; diff --git a/apps/web/src/connectors/webauthn-fallback.html b/apps/web/src/connectors/webauthn-fallback.html index 662eb0b6ba..43da5b1a48 100644 --- a/apps/web/src/connectors/webauthn-fallback.html +++ b/apps/web/src/connectors/webauthn-fallback.html @@ -15,75 +15,67 @@
-
- +
+ + + + - - - diff --git a/apps/web/src/images/domain-verification/domain.svg b/apps/web/src/images/domain-verification/domain.svg deleted file mode 100644 index 66b0ece2b1..0000000000 --- a/apps/web/src/images/domain-verification/domain.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html index fb17989aa5..cb4632ef54 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html @@ -103,7 +103,7 @@ {{ "noDeviceRequests" | i18n }} {{ "noDeviceRequestsDesc" | i18n }} diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts index bd62d97250..258a112e23 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts @@ -6,7 +6,7 @@ import { BehaviorSubject, Subject, switchMap, takeUntil, tap } from "rxjs"; import { OrganizationUserApiService } from "@bitwarden/admin-console/common"; import { SafeProvider, safeProvider } from "@bitwarden/angular/platform/utils/safe-provider"; -import { Devices } from "@bitwarden/assets/svg"; +import { DevicesIcon } from "@bitwarden/assets/svg"; import { OrganizationAuthRequestApiService } from "@bitwarden/bit-common/admin-console/auth-requests/organization-auth-request-api.service"; import { OrganizationAuthRequestService } from "@bitwarden/bit-common/admin-console/auth-requests/organization-auth-request.service"; import { PendingAuthRequestWithFingerprintView } from "@bitwarden/bit-common/admin-console/auth-requests/pending-auth-request-with-fingerprint.view"; @@ -51,7 +51,7 @@ export class DeviceApprovalsComponent implements OnInit, OnDestroy { loading = true; actionInProgress = false; - protected readonly Devices = Devices; + protected readonly DevicesIcon = DevicesIcon; private destroy$ = new Subject(); private refresh$ = new BehaviorSubject(null); diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.html b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.html index 20afe902b7..0b2bb4803f 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.html +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.html @@ -103,21 +103,13 @@ class="tw-mt-6 tw-flex tw-flex-col tw-items-center tw-justify-center" *ngIf="orgDomains?.length == 0" > - - -
- {{ "noDomains" | i18n }} -
- -
- - {{ "noDomainsSubText" | i18n }} - -
- - + +
{{ "noDomains" | i18n }}
+
{{ "noDomainsSubText" | i18n }}
+ +
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts index 1f644f55a9..3bc916d3fc 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts @@ -13,6 +13,7 @@ import { takeUntil, } from "rxjs"; +import { DomainIcon } from "@bitwarden/assets/svg"; import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction"; import { OrgDomainServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain.service.abstraction"; import { OrganizationDomainResponse } from "@bitwarden/common/admin-console/abstractions/organization-domain/responses/organization-domain.response"; @@ -40,6 +41,7 @@ import { export class DomainVerificationComponent implements OnInit, OnDestroy { private componentDestroyed$ = new Subject(); private singleOrgPolicyEnabled = false; + protected domainIcon = DomainIcon; loading = true; diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts index 8ff5d07024..ed11eb8ef0 100644 --- a/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts +++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts @@ -1,26 +1,29 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; import { GearIcon } from "@bitwarden/assets/svg"; +import { NoItemsModule } from "@bitwarden/components"; import { SharedOrganizationModule } from "@bitwarden/web-vault/app/admin-console/organizations/shared"; @Component({ selector: "app-no-clients", - imports: [SharedOrganizationModule], - template: `
- -

{{ "noClients" | i18n }}

- - - {{ "addNewOrganization" | i18n }} - -
`, + imports: [SharedOrganizationModule, NoItemsModule], + template: ` + +
{{ "noClients" | i18n }}
+ + + {{ "addNewOrganization" | i18n }} + + + `, }) export class NoClientsComponent { icon = GearIcon; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.html index 512ccbf5bb..2c4647f3d6 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.html @@ -1,7 +1,7 @@ - + {{ "organizationIsDisabled" | i18n }} {{ "secretsAccessSuspended" | i18n }} diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts index 0a7d6befde..6777df7ef7 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts @@ -2,7 +2,7 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { map, concatMap, firstValueFrom } from "rxjs"; -import { Icon, NoAccess } from "@bitwarden/assets/svg"; +import { Icon, DeactivatedOrg } from "@bitwarden/assets/svg"; import { getOrganizationById, OrganizationService, @@ -21,7 +21,7 @@ export class OrgSuspendedComponent { private route: ActivatedRoute, ) {} - protected NoAccess: Icon = NoAccess; + protected DeactivatedOrg: Icon = DeactivatedOrg; protected organizationName$ = this.route.params.pipe( concatMap(async (params) => { const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$)); diff --git a/libs/angular/src/auth/components/two-factor-icon.component.html b/libs/angular/src/auth/components/two-factor-icon.component.html index 46d5211ca0..1455870075 100644 --- a/libs/angular/src/auth/components/two-factor-icon.component.html +++ b/libs/angular/src/auth/components/two-factor-icon.component.html @@ -1,12 +1,7 @@ - - - - - - - - +
+ +
- -

{{ "noInvoicesToList" | i18n }}

-
`, + template: ` +
{{ "noInvoicesToList" | i18n }}
+ `, standalone: false, }) export class NoInvoicesComponent { - icon = PartnerTrustIcon; + icon = CreditCardIcon; } diff --git a/libs/angular/src/jslib.module.ts b/libs/angular/src/jslib.module.ts index 86042f4b77..c0bf1425d4 100644 --- a/libs/angular/src/jslib.module.ts +++ b/libs/angular/src/jslib.module.ts @@ -27,6 +27,7 @@ import { TypographyModule, CopyClickDirective, A11yTitleDirective, + NoItemsModule, } from "@bitwarden/components"; import { TwoFactorIconComponent } from "./auth/components/two-factor-icon.component"; @@ -77,6 +78,7 @@ import { IconComponent } from "./vault/components/icon.component"; TypographyModule, TableModule, MenuModule, + NoItemsModule, IconButtonModule, IconModule, LinkModule, diff --git a/libs/assets/src/svg/svgs/active-send.icon.ts b/libs/assets/src/svg/svgs/active-send.icon.ts index be5cb4540f..3b12ee865d 100644 --- a/libs/assets/src/svg/svgs/active-send.icon.ts +++ b/libs/assets/src/svg/svgs/active-send.icon.ts @@ -1,16 +1,19 @@ import { svgIcon } from "../icon-service"; export const ActiveSendIcon = svgIcon` - - - - - - - - - - - + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/browser-extension.ts b/libs/assets/src/svg/svgs/browser-extension.ts index 4e3b54e77c..c15a536c00 100644 --- a/libs/assets/src/svg/svgs/browser-extension.ts +++ b/libs/assets/src/svg/svgs/browser-extension.ts @@ -1,17 +1,18 @@ import { svgIcon } from "../icon-service"; export const BrowserExtensionIcon = svgIcon` - - - - - - - - - - - - - + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/create-passkey-failed.icon.ts b/libs/assets/src/svg/svgs/create-passkey-failed.icon.ts deleted file mode 100644 index 37e679b9b5..0000000000 --- a/libs/assets/src/svg/svgs/create-passkey-failed.icon.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const CreatePasskeyFailedIcon = svgIcon` - - - - - - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/create-passkey.icon.ts b/libs/assets/src/svg/svgs/create-passkey.icon.ts deleted file mode 100644 index efe180e1e2..0000000000 --- a/libs/assets/src/svg/svgs/create-passkey.icon.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const CreatePasskeyIcon = svgIcon` - - - - - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/credit-card.icon.ts b/libs/assets/src/svg/svgs/credit-card.icon.ts new file mode 100644 index 0000000000..e334766fac --- /dev/null +++ b/libs/assets/src/svg/svgs/credit-card.icon.ts @@ -0,0 +1,15 @@ +import { svgIcon } from "../icon-service"; + +export const CreditCardIcon = svgIcon` + + + + + + + + + + + +`; diff --git a/libs/assets/src/svg/svgs/deactivated-org.ts b/libs/assets/src/svg/svgs/deactivated-org.ts index 92a1064e31..75b25e3fd2 100644 --- a/libs/assets/src/svg/svgs/deactivated-org.ts +++ b/libs/assets/src/svg/svgs/deactivated-org.ts @@ -1,32 +1,31 @@ import { svgIcon } from "../icon-service"; export const DeactivatedOrg = svgIcon` - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/device-verification.icon.ts b/libs/assets/src/svg/svgs/device-verification.icon.ts deleted file mode 100644 index c8fccbf7ec..0000000000 --- a/libs/assets/src/svg/svgs/device-verification.icon.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const DeviceVerificationIcon = svgIcon` - - - - - - - - - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/devices.icon.ts b/libs/assets/src/svg/svgs/devices.icon.ts index 471b44017b..7c97df4865 100644 --- a/libs/assets/src/svg/svgs/devices.icon.ts +++ b/libs/assets/src/svg/svgs/devices.icon.ts @@ -1,52 +1,25 @@ import { svgIcon } from "../icon-service"; export const DevicesIcon = svgIcon` - - - - - - - - - + + + + + + + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/devices.ts b/libs/assets/src/svg/svgs/devices.ts deleted file mode 100644 index 517256ec59..0000000000 --- a/libs/assets/src/svg/svgs/devices.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const Devices = svgIcon` - - - - - - - - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/domain.icon.ts b/libs/assets/src/svg/svgs/domain.icon.ts new file mode 100644 index 0000000000..04bd173be9 --- /dev/null +++ b/libs/assets/src/svg/svgs/domain.icon.ts @@ -0,0 +1,15 @@ +import { svgIcon } from "../icon-service"; + +export const DomainIcon = svgIcon` + + + + + + + + + + + +`; diff --git a/libs/assets/src/svg/svgs/email.icon.ts b/libs/assets/src/svg/svgs/email.icon.ts deleted file mode 100644 index c634170788..0000000000 --- a/libs/assets/src/svg/svgs/email.icon.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const EmailIcon = svgIcon` - - Email - - - - - - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/empty-trash.ts b/libs/assets/src/svg/svgs/empty-trash.ts index 61df8933d4..d6c0043d88 100644 --- a/libs/assets/src/svg/svgs/empty-trash.ts +++ b/libs/assets/src/svg/svgs/empty-trash.ts @@ -1,18 +1,15 @@ import { svgIcon } from "../icon-service"; export const EmptyTrash = svgIcon` - - - - - - - - - - - - - - + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/expired-send.icon.ts b/libs/assets/src/svg/svgs/expired-send.icon.ts deleted file mode 100644 index 19283525b4..0000000000 --- a/libs/assets/src/svg/svgs/expired-send.icon.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const ExpiredSendIcon = svgIcon` - - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/gear.ts b/libs/assets/src/svg/svgs/gear.ts index 35349f78cc..261c6d262e 100644 --- a/libs/assets/src/svg/svgs/gear.ts +++ b/libs/assets/src/svg/svgs/gear.ts @@ -1,20 +1,23 @@ import { svgIcon } from "../icon-service"; export const GearIcon = svgIcon` - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/index.ts b/libs/assets/src/svg/svgs/index.ts index a5a4c215a2..10f2f7cd8d 100644 --- a/libs/assets/src/svg/svgs/index.ts +++ b/libs/assets/src/svg/svgs/index.ts @@ -7,66 +7,49 @@ export * from "./bitwarden-logo.icon"; export * from "./browser-extension"; export { default as BusinessUnitPortalLogo } from "./business-unit-portal"; export * from "./carousel-icon"; -export * from "./create-passkey-failed.icon"; -export * from "./create-passkey.icon"; +export * from "./credit-card.icon"; export * from "./deactivated-org"; -export * from "./device-verification.icon"; export * from "./devices.icon"; -export * from "./devices"; -export * from "./email.icon"; +export * from "./domain.icon"; export * from "./empty-trash"; -export * from "./expired-send.icon"; export * from "./extension-bitwarden-logo.icon"; export * from "./gear"; export * from "./generator"; +export * from "./item-types"; export * from "./lock.icon"; export * from "./login-cards"; -export * from "./no-access"; export * from "./no-credentials.icon"; export * from "./no-folders"; export * from "./no-results"; export * from "./no-send.icon"; -export * from "./partner-trust"; export * from "./party"; export { default as PasswordManagerLogo } from "./password-manager"; export { default as ProviderPortalLogo } from "./provider-portal"; -export * from "./recovery.icon"; export * from "./registration-check-email.icon"; -export * from "./registration-expired-link.icon"; -export * from "./registration-lock-alt.icon"; export * from "./registration-user-add.icon"; export * from "./report-breach.icon"; export * from "./report-exposed-passwords.icon"; -export * from "./report-inactive-two-factor.icon"; -export * from "./report-member-access.icon"; -export * from "./report-reused-passwords.icon"; export * from "./report-unsecured-websites.icon"; -export * from "./report-weak-passwords.icon"; export * from "./restricted-view"; -export * from "./search"; export * from "./secrets-manager-alt"; export { default as SecretsManagerLogo } from "./secrets-manager"; -export * from "./secure-devices"; -export * from "./secure-user"; -export * from "./security-handshake"; export * from "./security"; export * from "./send"; export * from "./settings"; export * from "./shield"; export * from "./sso-key.icon"; -export * from "./subscription-hidden"; -export * from "./totp.icon"; export * from "./two-factor-auth-authenticator.icon"; export * from "./two-factor-auth-duo.icon"; export * from "./two-factor-auth-email.icon"; +export * from "./two-factor-auth-security-key-failed.icon"; export * from "./two-factor-auth-security-key.icon"; export * from "./two-factor-auth-webauthn.icon"; export * from "./two-factor-auth-yubico.icon"; export * from "./two-factor-timeout.icon"; +export * from "./unlocked.icon"; export * from "./user-lock.icon"; export * from "./user-verification-biometrics-fingerprint.icon"; export * from "./vault-open"; export * from "./vault.icon"; export * from "./vault"; export * from "./wave.icon"; -export * from "./webauthn.icon"; diff --git a/libs/assets/src/svg/svgs/item-types.ts b/libs/assets/src/svg/svgs/item-types.ts new file mode 100644 index 0000000000..50ed51bd01 --- /dev/null +++ b/libs/assets/src/svg/svgs/item-types.ts @@ -0,0 +1,23 @@ +import { svgIcon } from "../icon-service"; + +export const ItemTypes = svgIcon` + + + + + + + + + + + + + + + + + + + +`; diff --git a/libs/assets/src/svg/svgs/lock.icon.ts b/libs/assets/src/svg/svgs/lock.icon.ts index 5d5d23bcdd..9d73ad6294 100644 --- a/libs/assets/src/svg/svgs/lock.icon.ts +++ b/libs/assets/src/svg/svgs/lock.icon.ts @@ -1,17 +1,15 @@ import { svgIcon } from "../icon-service"; export const LockIcon = svgIcon` - - - - - - - - - - - - - + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/login-cards.ts b/libs/assets/src/svg/svgs/login-cards.ts index 0eea164a51..3a43b1a012 100644 --- a/libs/assets/src/svg/svgs/login-cards.ts +++ b/libs/assets/src/svg/svgs/login-cards.ts @@ -1,11 +1,21 @@ import { svgIcon } from "../icon-service"; export const LoginCards = svgIcon` - - - - - - - + + + + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/no-access.ts b/libs/assets/src/svg/svgs/no-access.ts deleted file mode 100644 index 6c9dfae939..0000000000 --- a/libs/assets/src/svg/svgs/no-access.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const NoAccess = svgIcon` - - - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/no-credentials.icon.ts b/libs/assets/src/svg/svgs/no-credentials.icon.ts index a825de2f95..bfecfd4834 100644 --- a/libs/assets/src/svg/svgs/no-credentials.icon.ts +++ b/libs/assets/src/svg/svgs/no-credentials.icon.ts @@ -1,27 +1,13 @@ import { svgIcon } from "../icon-service"; export const NoCredentialsIcon = svgIcon` - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/no-folders.ts b/libs/assets/src/svg/svgs/no-folders.ts index ea06a9827e..c8858ca83e 100644 --- a/libs/assets/src/svg/svgs/no-folders.ts +++ b/libs/assets/src/svg/svgs/no-folders.ts @@ -1,19 +1,15 @@ import { svgIcon } from "../icon-service"; export const NoFolders = svgIcon` - - - - - - - - - - - - - - - + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/no-results.ts b/libs/assets/src/svg/svgs/no-results.ts index ce45fce7f3..5f914ad213 100644 --- a/libs/assets/src/svg/svgs/no-results.ts +++ b/libs/assets/src/svg/svgs/no-results.ts @@ -1,18 +1,16 @@ import { svgIcon } from "../icon-service"; export const NoResults = svgIcon` - - - - - - - - - - - - - - + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/no-send.icon.ts b/libs/assets/src/svg/svgs/no-send.icon.ts index 8510693096..a246c0177f 100644 --- a/libs/assets/src/svg/svgs/no-send.icon.ts +++ b/libs/assets/src/svg/svgs/no-send.icon.ts @@ -1,13 +1,19 @@ import { svgIcon } from "../icon-service"; export const NoSendsIcon = svgIcon` - - - - - - - - + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/partner-trust.ts b/libs/assets/src/svg/svgs/partner-trust.ts deleted file mode 100644 index 2224987411..0000000000 --- a/libs/assets/src/svg/svgs/partner-trust.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const PartnerTrustIcon = svgIcon` - - - - - - - - - - - - - - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/party.ts b/libs/assets/src/svg/svgs/party.ts index 6fb587a7c1..efa5331f4f 100644 --- a/libs/assets/src/svg/svgs/party.ts +++ b/libs/assets/src/svg/svgs/party.ts @@ -1,30 +1,25 @@ import { svgIcon } from "../icon-service"; export const Party = svgIcon` - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/recovery.icon.ts b/libs/assets/src/svg/svgs/recovery.icon.ts deleted file mode 100644 index 95de89cad0..0000000000 --- a/libs/assets/src/svg/svgs/recovery.icon.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const RecoveryCodeIcon = svgIcon` - - Recovery Code - - - - - - - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/registration-check-email.icon.ts b/libs/assets/src/svg/svgs/registration-check-email.icon.ts index dd8a5c2cbd..ae4cf3098e 100644 --- a/libs/assets/src/svg/svgs/registration-check-email.icon.ts +++ b/libs/assets/src/svg/svgs/registration-check-email.icon.ts @@ -1,23 +1,18 @@ import { svgIcon } from "../icon-service"; export const RegistrationCheckEmailIcon = svgIcon` - - - - - - - - - - - + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/registration-expired-link.icon.ts b/libs/assets/src/svg/svgs/registration-expired-link.icon.ts deleted file mode 100644 index fbeda6c25a..0000000000 --- a/libs/assets/src/svg/svgs/registration-expired-link.icon.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const RegistrationExpiredLinkIcon = svgIcon` - - - -`; diff --git a/libs/assets/src/svg/svgs/registration-lock-alt.icon.ts b/libs/assets/src/svg/svgs/registration-lock-alt.icon.ts deleted file mode 100644 index 2172d293d9..0000000000 --- a/libs/assets/src/svg/svgs/registration-lock-alt.icon.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const RegistrationLockAltIcon = svgIcon` - - - - - - - - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/registration-user-add.icon.ts b/libs/assets/src/svg/svgs/registration-user-add.icon.ts index 2aa5bcc81b..7428daa584 100644 --- a/libs/assets/src/svg/svgs/registration-user-add.icon.ts +++ b/libs/assets/src/svg/svgs/registration-user-add.icon.ts @@ -1,24 +1,19 @@ import { svgIcon } from "../icon-service"; export const RegistrationUserAddIcon = svgIcon` - - - - - - - - - - + + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/report-breach.icon.ts b/libs/assets/src/svg/svgs/report-breach.icon.ts index 6e7fde74cb..83dd6c72b8 100644 --- a/libs/assets/src/svg/svgs/report-breach.icon.ts +++ b/libs/assets/src/svg/svgs/report-breach.icon.ts @@ -1,14 +1,14 @@ import { svgIcon } from "../icon-service"; export const ReportBreach = svgIcon` - - - - - - - - - + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/report-exposed-passwords.icon.ts b/libs/assets/src/svg/svgs/report-exposed-passwords.icon.ts index 0a01988580..0309eb643d 100644 --- a/libs/assets/src/svg/svgs/report-exposed-passwords.icon.ts +++ b/libs/assets/src/svg/svgs/report-exposed-passwords.icon.ts @@ -1,16 +1,32 @@ import { svgIcon } from "../icon-service"; export const ReportExposedPasswords = svgIcon` - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/report-inactive-two-factor.icon.ts b/libs/assets/src/svg/svgs/report-inactive-two-factor.icon.ts deleted file mode 100644 index d7ad3c9084..0000000000 --- a/libs/assets/src/svg/svgs/report-inactive-two-factor.icon.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const ReportInactiveTwoFactor = svgIcon` - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/report-member-access.icon.ts b/libs/assets/src/svg/svgs/report-member-access.icon.ts deleted file mode 100644 index c47fed9cd2..0000000000 --- a/libs/assets/src/svg/svgs/report-member-access.icon.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const MemberAccess = svgIcon` - - - - - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/report-reused-passwords.icon.ts b/libs/assets/src/svg/svgs/report-reused-passwords.icon.ts deleted file mode 100644 index 30aaeee80f..0000000000 --- a/libs/assets/src/svg/svgs/report-reused-passwords.icon.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const ReportReusedPasswords = svgIcon` - - - - - -`; diff --git a/libs/assets/src/svg/svgs/report-unsecured-websites.icon.ts b/libs/assets/src/svg/svgs/report-unsecured-websites.icon.ts index d55c06987c..487381ccaa 100644 --- a/libs/assets/src/svg/svgs/report-unsecured-websites.icon.ts +++ b/libs/assets/src/svg/svgs/report-unsecured-websites.icon.ts @@ -1,12 +1,15 @@ import { svgIcon } from "../icon-service"; export const ReportUnsecuredWebsites = svgIcon` - - - - - - - + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/report-weak-passwords.icon.ts b/libs/assets/src/svg/svgs/report-weak-passwords.icon.ts deleted file mode 100644 index 9709255169..0000000000 --- a/libs/assets/src/svg/svgs/report-weak-passwords.icon.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const ReportWeakPasswords = svgIcon` - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/restricted-view.ts b/libs/assets/src/svg/svgs/restricted-view.ts index afe6c75287..5eec1a4a97 100644 --- a/libs/assets/src/svg/svgs/restricted-view.ts +++ b/libs/assets/src/svg/svgs/restricted-view.ts @@ -1,6 +1,19 @@ import { svgIcon } from "../icon-service"; -export const RestrictedView = svgIcon` - - -`; +export const RestrictedView = svgIcon` + + + + + + + + + + + + + + + +`; diff --git a/libs/assets/src/svg/svgs/search.ts b/libs/assets/src/svg/svgs/search.ts deleted file mode 100644 index 40f323acf3..0000000000 --- a/libs/assets/src/svg/svgs/search.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const Search = svgIcon` - - - - - - - - - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/secure-devices.ts b/libs/assets/src/svg/svgs/secure-devices.ts deleted file mode 100644 index ed216f1bc8..0000000000 --- a/libs/assets/src/svg/svgs/secure-devices.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const SecureDevices = svgIcon` - - - - - - - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/secure-user.ts b/libs/assets/src/svg/svgs/secure-user.ts deleted file mode 100644 index 8684549a81..0000000000 --- a/libs/assets/src/svg/svgs/secure-user.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const SecureUser = svgIcon` - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/security-handshake.ts b/libs/assets/src/svg/svgs/security-handshake.ts deleted file mode 100644 index f6309bc4c5..0000000000 --- a/libs/assets/src/svg/svgs/security-handshake.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const SecurityHandshake = svgIcon` - - - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/security.ts b/libs/assets/src/svg/svgs/security.ts index 0edf0aec14..6e475b25ab 100644 --- a/libs/assets/src/svg/svgs/security.ts +++ b/libs/assets/src/svg/svgs/security.ts @@ -1,50 +1,21 @@ import { svgIcon } from "../icon-service"; export const Security = svgIcon` - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/shield.ts b/libs/assets/src/svg/svgs/shield.ts index 708642dc6e..b0c781bd00 100644 --- a/libs/assets/src/svg/svgs/shield.ts +++ b/libs/assets/src/svg/svgs/shield.ts @@ -4,7 +4,7 @@ import { svgIcon } from "../icon-service"; * Shield logo with extra space in the viewbox. */ const AnonLayoutBitwardenShield = svgIcon` - + `; diff --git a/libs/assets/src/svg/svgs/sso-key.icon.ts b/libs/assets/src/svg/svgs/sso-key.icon.ts index 533c033fea..ad81c70744 100644 --- a/libs/assets/src/svg/svgs/sso-key.icon.ts +++ b/libs/assets/src/svg/svgs/sso-key.icon.ts @@ -1,10 +1,11 @@ import { svgIcon } from "../icon-service"; export const SsoKeyIcon = svgIcon` - - - - - - + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/subscription-hidden.ts b/libs/assets/src/svg/svgs/subscription-hidden.ts deleted file mode 100644 index 38840580f8..0000000000 --- a/libs/assets/src/svg/svgs/subscription-hidden.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const SubscriptionHiddenIcon = svgIcon` - - - - - - - - - - - - - - - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/totp.icon.ts b/libs/assets/src/svg/svgs/totp.icon.ts deleted file mode 100644 index 00e96c93b6..0000000000 --- a/libs/assets/src/svg/svgs/totp.icon.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const TOTPIcon = svgIcon` - - TOTP Authenticator - - - - - - - - - - - - - - - - - -`; diff --git a/libs/assets/src/svg/svgs/two-factor-auth-authenticator.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-authenticator.icon.ts index 8e4e381eeb..622875b59f 100644 --- a/libs/assets/src/svg/svgs/two-factor-auth-authenticator.icon.ts +++ b/libs/assets/src/svg/svgs/two-factor-auth-authenticator.icon.ts @@ -1,39 +1,21 @@ import { svgIcon } from "../icon-service"; export const TwoFactorAuthAuthenticatorIcon = svgIcon` - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/two-factor-auth-email.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-email.icon.ts index 71ffc099e5..20709a8a1e 100644 --- a/libs/assets/src/svg/svgs/two-factor-auth-email.icon.ts +++ b/libs/assets/src/svg/svgs/two-factor-auth-email.icon.ts @@ -1,18 +1,18 @@ import { svgIcon } from "../icon-service"; export const TwoFactorAuthEmailIcon = svgIcon` - - - - - - - - - - + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/two-factor-auth-security-key-failed.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-security-key-failed.icon.ts new file mode 100644 index 0000000000..0e467bf190 --- /dev/null +++ b/libs/assets/src/svg/svgs/two-factor-auth-security-key-failed.icon.ts @@ -0,0 +1,17 @@ +import { svgIcon } from "../icon-service"; + +export const TwoFactorAuthSecurityKeyFailedIcon = svgIcon` + + + + + + + + + + + + + +`; diff --git a/libs/assets/src/svg/svgs/two-factor-auth-security-key.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-security-key.icon.ts index 30ef25baab..f10068b735 100644 --- a/libs/assets/src/svg/svgs/two-factor-auth-security-key.icon.ts +++ b/libs/assets/src/svg/svgs/two-factor-auth-security-key.icon.ts @@ -1,52 +1,20 @@ import { svgIcon } from "../icon-service"; export const TwoFactorAuthSecurityKeyIcon = svgIcon` - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/two-factor-auth-webauthn.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-webauthn.icon.ts index f5e7519e02..b911425958 100644 --- a/libs/assets/src/svg/svgs/two-factor-auth-webauthn.icon.ts +++ b/libs/assets/src/svg/svgs/two-factor-auth-webauthn.icon.ts @@ -1,40 +1,17 @@ import { svgIcon } from "../icon-service"; export const TwoFactorAuthWebAuthnIcon = svgIcon` - - - - - - - - - - - - - - + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/two-factor-timeout.icon.ts b/libs/assets/src/svg/svgs/two-factor-timeout.icon.ts index 7a5e04c07a..55ca4f4e94 100644 --- a/libs/assets/src/svg/svgs/two-factor-timeout.icon.ts +++ b/libs/assets/src/svg/svgs/two-factor-timeout.icon.ts @@ -1,8 +1,14 @@ import { svgIcon } from "../icon-service"; export const TwoFactorTimeoutIcon = svgIcon` - - - - + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/unlocked.icon.ts b/libs/assets/src/svg/svgs/unlocked.icon.ts new file mode 100644 index 0000000000..6ce40819e4 --- /dev/null +++ b/libs/assets/src/svg/svgs/unlocked.icon.ts @@ -0,0 +1,15 @@ +import { svgIcon } from "../icon-service"; + +export const UnlockedIcon = svgIcon` + + + + + + + + + + + +`; diff --git a/libs/assets/src/svg/svgs/user-lock.icon.ts b/libs/assets/src/svg/svgs/user-lock.icon.ts index ad56d61226..cc848a0576 100644 --- a/libs/assets/src/svg/svgs/user-lock.icon.ts +++ b/libs/assets/src/svg/svgs/user-lock.icon.ts @@ -1,102 +1,20 @@ import { svgIcon } from "../icon-service"; export const UserLockIcon = svgIcon` - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + -`; + `; diff --git a/libs/assets/src/svg/svgs/user-verification-biometrics-fingerprint.icon.ts b/libs/assets/src/svg/svgs/user-verification-biometrics-fingerprint.icon.ts index b3ace19a93..19e1aa3e6c 100644 --- a/libs/assets/src/svg/svgs/user-verification-biometrics-fingerprint.icon.ts +++ b/libs/assets/src/svg/svgs/user-verification-biometrics-fingerprint.icon.ts @@ -1,12 +1,12 @@ import { svgIcon } from "../icon-service"; export const UserVerificationBiometricsIcon = svgIcon` - - - - - - - - + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/vault-open.ts b/libs/assets/src/svg/svgs/vault-open.ts index e644e316c0..3ad82b9bba 100644 --- a/libs/assets/src/svg/svgs/vault-open.ts +++ b/libs/assets/src/svg/svgs/vault-open.ts @@ -1,17 +1,25 @@ import { svgIcon } from "../icon-service"; export const VaultOpen = svgIcon` - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/vault.icon.ts b/libs/assets/src/svg/svgs/vault.icon.ts index 21fcac24e7..61ec2589b3 100644 --- a/libs/assets/src/svg/svgs/vault.icon.ts +++ b/libs/assets/src/svg/svgs/vault.icon.ts @@ -1,23 +1,23 @@ import { svgIcon } from "../icon-service"; export const VaultIcon = svgIcon` - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/wave.icon.ts b/libs/assets/src/svg/svgs/wave.icon.ts index b7e16213d0..6c97d0fbbb 100644 --- a/libs/assets/src/svg/svgs/wave.icon.ts +++ b/libs/assets/src/svg/svgs/wave.icon.ts @@ -1,34 +1,11 @@ import { svgIcon } from "../icon-service"; export const WaveIcon = svgIcon` - - - - - - - + + + + + + + `; diff --git a/libs/assets/src/svg/svgs/webauthn.icon.ts b/libs/assets/src/svg/svgs/webauthn.icon.ts deleted file mode 100644 index 923c75b43c..0000000000 --- a/libs/assets/src/svg/svgs/webauthn.icon.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { svgIcon } from "../icon-service"; - -export const WebAuthnIcon = svgIcon` - - Webauthn - - - - - - - - - - -`; diff --git a/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts b/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts index d4267dba1e..9e75a8b888 100644 --- a/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts +++ b/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts @@ -6,7 +6,7 @@ import { ActivatedRoute, RouterModule } from "@angular/router"; import { Subject, firstValueFrom } from "rxjs"; import { JslibModule } from "@bitwarden/angular/jslib.module"; -import { RegistrationExpiredLinkIcon } from "@bitwarden/assets/svg"; +import { TwoFactorTimeoutIcon } from "@bitwarden/assets/svg"; // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop. // eslint-disable-next-line no-restricted-imports import { ButtonModule, IconModule } from "@bitwarden/components"; @@ -29,7 +29,7 @@ export class RegistrationLinkExpiredComponent implements OnInit, OnDestroy { loginRoute: string; - readonly Icons = { RegistrationExpiredLinkIcon }; + readonly Icons = { TwoFactorTimeoutIcon }; constructor(private activatedRoute: ActivatedRoute) {} diff --git a/libs/auth/src/angular/user-verification/user-verification-form-input.component.html b/libs/auth/src/angular/user-verification/user-verification-form-input.component.html index 56bce040d2..70d8836edd 100644 --- a/libs/auth/src/angular/user-verification/user-verification-form-input.component.html +++ b/libs/auth/src/angular/user-verification/user-verification-form-input.component.html @@ -41,7 +41,9 @@ " >
- +
+ +

{{ "verifyWithBiometrics" | i18n }}

diff --git a/libs/components/src/anon-layout/anon-layout.component.html b/libs/components/src/anon-layout/anon-layout.component.html index 4be11b607c..f22d12f513 100644 --- a/libs/components/src/anon-layout/anon-layout.component.html +++ b/libs/components/src/anon-layout/anon-layout.component.html @@ -14,7 +14,7 @@
-
+
diff --git a/libs/components/src/icon/icon.component.ts b/libs/components/src/icon/icon.component.ts index 49f284b947..1ef7185c88 100644 --- a/libs/components/src/icon/icon.component.ts +++ b/libs/components/src/icon/icon.component.ts @@ -9,6 +9,7 @@ import { Icon, isIcon } from "@bitwarden/assets/svg"; "[attr.aria-hidden]": "!ariaLabel()", "[attr.aria-label]": "ariaLabel()", "[innerHtml]": "innerHtml", + class: "tw-max-h-full tw-flex tw-justify-center", }, template: ``, }) diff --git a/libs/components/src/icon/icon.stories.ts b/libs/components/src/icon/icon.stories.ts index e355c3e6e7..e94a7aaf51 100644 --- a/libs/components/src/icon/icon.stories.ts +++ b/libs/components/src/icon/icon.stories.ts @@ -37,7 +37,7 @@ export const Default = {
{{icon[0]}}
- +
} diff --git a/libs/components/src/no-items/no-items.component.html b/libs/components/src/no-items/no-items.component.html index a2659abb9a..8caaea3b8e 100644 --- a/libs/components/src/no-items/no-items.component.html +++ b/libs/components/src/no-items/no-items.component.html @@ -1,6 +1,8 @@
- +
+ +

diff --git a/libs/components/src/no-items/no-items.component.ts b/libs/components/src/no-items/no-items.component.ts index 3d7394a16a..517abfc953 100644 --- a/libs/components/src/no-items/no-items.component.ts +++ b/libs/components/src/no-items/no-items.component.ts @@ -1,6 +1,6 @@ import { Component, input } from "@angular/core"; -import { Search } from "@bitwarden/assets/svg"; +import { NoResults } from "@bitwarden/assets/svg"; import { BitIconComponent } from "../icon/icon.component"; @@ -13,5 +13,5 @@ import { BitIconComponent } from "../icon/icon.component"; imports: [BitIconComponent], }) export class NoItemsComponent { - readonly icon = input(Search); + readonly icon = input(NoResults); } diff --git a/libs/components/src/no-items/no-items.stories.ts b/libs/components/src/no-items/no-items.stories.ts index 48d52476b1..8a167ea119 100644 --- a/libs/components/src/no-items/no-items.stories.ts +++ b/libs/components/src/no-items/no-items.stories.ts @@ -1,5 +1,21 @@ import { Meta, StoryObj, moduleMetadata } from "@storybook/angular"; +import { + ActiveSendIcon, + DeactivatedOrg, + DevicesIcon, + DomainIcon, + EmptyTrash, + GearIcon, + NoCredentialsIcon, + NoFolders, + NoResults, + NoSendsIcon, + RestrictedView, + Security, + VaultOpen, +} from "@bitwarden/assets/svg"; + import { ButtonModule } from "../button"; import { NoItemsComponent } from "./no-items.component"; @@ -23,11 +39,27 @@ export default { type Story = StoryObj; +const Icons = { + EmptyTrash, + NoFolders, + NoResults, + NoSendsIcon, + VaultOpen, + DeactivatedOrg, + ActiveSendIcon, + DevicesIcon, + Security, + NoCredentialsIcon, + RestrictedView, + DomainIcon, + GearIcon, +}; + export const Default: Story = { render: (args) => ({ props: args, - template: ` - + template: /*html*/ ` + No items found Your description here.