diff --git a/apps/web/src/app/admin-console/icons/admin-console-logo.ts b/apps/web/src/app/admin-console/icons/admin-console-logo.ts deleted file mode 100644 index 25b463217eb..00000000000 --- a/apps/web/src/app/admin-console/icons/admin-console-logo.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { svgIcon } from "@bitwarden/components"; - -export const AdminConsoleLogo = svgIcon` - - - - - - - - - - - - - - - - - - - - - - - -`; diff --git a/apps/web/src/app/admin-console/icons/business-unit-portal-logo.icon.ts b/apps/web/src/app/admin-console/icons/business-unit-portal-logo.icon.ts deleted file mode 100644 index f913ee68ef0..00000000000 --- a/apps/web/src/app/admin-console/icons/business-unit-portal-logo.icon.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { svgIcon } from "@bitwarden/components"; - -export const BusinessUnitPortalLogo = svgIcon` - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -`; diff --git a/apps/web/src/app/admin-console/icons/provider-portal-logo.ts b/apps/web/src/app/admin-console/icons/provider-portal-logo.ts deleted file mode 100644 index bc77c3f7902..00000000000 --- a/apps/web/src/app/admin-console/icons/provider-portal-logo.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { svgIcon } from "@bitwarden/components"; - -export const ProviderPortalLogo = svgIcon` - - - - - - - - - - - - - - - - - - - - - - - - - -`; diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts index 0fc49067740..52260168d4c 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts @@ -12,9 +12,12 @@ import { ProviderStatusType, ProviderType } from "@bitwarden/common/admin-consol import { Provider } from "@bitwarden/common/admin-console/models/domain/provider"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; -import { Icon, IconModule } from "@bitwarden/components"; -import { BusinessUnitPortalLogo } from "@bitwarden/web-vault/app/admin-console/icons/business-unit-portal-logo.icon"; -import { ProviderPortalLogo } from "@bitwarden/web-vault/app/admin-console/icons/provider-portal-logo"; +import { + Icon, + IconModule, + ProviderPortalLogo, + BusinessUnitPortalLogo, +} from "@bitwarden/components"; import { WebLayoutModule } from "@bitwarden/web-vault/app/layouts/web-layout.module"; import { ProviderWarningsService } from "../../billing/providers/services/provider-warnings.service"; diff --git a/libs/components/src/icon/index.ts b/libs/components/src/icon/index.ts index 4f797326be3..01819a3678e 100644 --- a/libs/components/src/icon/index.ts +++ b/libs/components/src/icon/index.ts @@ -1,4 +1,10 @@ export * from "./icon.module"; export * from "./icon"; export * as Icons from "./icons"; -export { AdminConsoleLogo, PasswordManagerLogo, SecretsManagerLogo } from "./logos"; +export { + AdminConsoleLogo, + BusinessUnitPortalLogo, + PasswordManagerLogo, + ProviderPortalLogo, + SecretsManagerLogo, +} from "./logos"; diff --git a/libs/components/src/icon/logos/bitwarden/admin-console.ts b/libs/components/src/icon/logos/bitwarden/admin-console.ts index 673cf9642c8..5fa96d91dfe 100644 --- a/libs/components/src/icon/logos/bitwarden/admin-console.ts +++ b/libs/components/src/icon/logos/bitwarden/admin-console.ts @@ -1,7 +1,7 @@ import { svgIcon } from "../../icon"; const AdminConsoleLogo = svgIcon` - + `; export default AdminConsoleLogo; diff --git a/libs/components/src/icon/logos/bitwarden/business-unit-portal.ts b/libs/components/src/icon/logos/bitwarden/business-unit-portal.ts new file mode 100644 index 00000000000..6206256f88b --- /dev/null +++ b/libs/components/src/icon/logos/bitwarden/business-unit-portal.ts @@ -0,0 +1,7 @@ +import { svgIcon } from "../../icon"; + +const BusinessUnitPortalLogo = svgIcon` + +`; + +export default BusinessUnitPortalLogo; diff --git a/libs/components/src/icon/logos/bitwarden/index.ts b/libs/components/src/icon/logos/bitwarden/index.ts index ba78bdb4fe5..d74c6fe453a 100644 --- a/libs/components/src/icon/logos/bitwarden/index.ts +++ b/libs/components/src/icon/logos/bitwarden/index.ts @@ -1,4 +1,6 @@ export { default as AdminConsoleLogo } from "./admin-console"; +export { default as BusinessUnitPortalLogo } from "./business-unit-portal"; export * from "./shield"; export { default as PasswordManagerLogo } from "./password-manager"; +export { default as ProviderPortalLogo } from "./provider-portal"; export { default as SecretsManagerLogo } from "./secrets-manager"; diff --git a/libs/components/src/icon/logos/bitwarden/password-manager.ts b/libs/components/src/icon/logos/bitwarden/password-manager.ts index 37b62c5dbc2..7586e28bfae 100644 --- a/libs/components/src/icon/logos/bitwarden/password-manager.ts +++ b/libs/components/src/icon/logos/bitwarden/password-manager.ts @@ -1,7 +1,7 @@ import { svgIcon } from "../../icon"; const PasswordManagerLogo = svgIcon` - + `; export default PasswordManagerLogo; diff --git a/libs/components/src/icon/logos/bitwarden/provider-portal.ts b/libs/components/src/icon/logos/bitwarden/provider-portal.ts new file mode 100644 index 00000000000..b9c4d76b0e3 --- /dev/null +++ b/libs/components/src/icon/logos/bitwarden/provider-portal.ts @@ -0,0 +1,7 @@ +import { svgIcon } from "../../icon"; + +const ProviderPortalLogo = svgIcon` + +`; + +export default ProviderPortalLogo; diff --git a/libs/components/src/icon/logos/bitwarden/secrets-manager.ts b/libs/components/src/icon/logos/bitwarden/secrets-manager.ts index bcba5f71d1a..45f3418b1e8 100644 --- a/libs/components/src/icon/logos/bitwarden/secrets-manager.ts +++ b/libs/components/src/icon/logos/bitwarden/secrets-manager.ts @@ -1,7 +1,7 @@ import { svgIcon } from "../../icon"; const SecretsManagerLogo = svgIcon` - + `; export default SecretsManagerLogo; diff --git a/libs/components/src/icon/logos/bitwarden/shield.ts b/libs/components/src/icon/logos/bitwarden/shield.ts index b942715bb6d..d736a44ba3e 100644 --- a/libs/components/src/icon/logos/bitwarden/shield.ts +++ b/libs/components/src/icon/logos/bitwarden/shield.ts @@ -10,7 +10,7 @@ const AnonLayoutBitwardenShield = svgIcon` `; const BitwardenShield = svgIcon` - + `; export { AnonLayoutBitwardenShield, BitwardenShield }; diff --git a/libs/components/src/navigation/nav-item.component.html b/libs/components/src/navigation/nav-item.component.html index d25f3adafb5..f7d55a33362 100644 --- a/libs/components/src/navigation/nav-item.component.html +++ b/libs/components/src/navigation/nav-item.component.html @@ -17,8 +17,8 @@