From 91fc1fa6302007010caff7701a3afec626959a29 Mon Sep 17 00:00:00 2001 From: Maciej Zieniuk Date: Tue, 5 Nov 2024 12:25:33 +0000 Subject: [PATCH] PM-14445: Wrong formatting due to merge conflict --- .../platform/popup/layout/popup-header.component.html | 2 +- .../platform/popup/layout/popup-page.component.html | 2 +- apps/cli/src/tools/export.command.ts | 2 +- .../filters/collection-filter.component.html | 4 ++-- .../vault-filter/filters/folder-filter.component.html | 6 +++--- .../filters/organization-filter.component.html | 4 ++-- .../vault-filter/filters/type-filter.component.html | 2 +- .../account/change-avatar-dialog.component.html | 2 +- .../complete-trial-initiation.component.html | 2 +- .../secrets-manager-trial-paid-stepper.component.html | 2 +- .../trial-initiation/trial-initiation.component.html | 2 +- .../vertical-step-content.component.html | 8 ++++---- .../vertical-stepper/vertical-step.component.html | 2 +- .../organizations/change-plan-dialog.component.html | 4 ++-- .../organizations/change-plan-dialog.component.ts | 2 +- .../src/app/layouts/header/web-header.component.html | 2 +- .../product-switcher-content.component.html | 2 +- .../onboarding/onboarding-task.component.html | 2 +- .../app/vault/individual-vault/add-edit.component.html | 2 +- .../services/routed-vault-filter.service.ts | 2 +- .../components/vault-filter-section.component.html | 6 +++--- .../bit-web/src/app/auth/sso/sso.component.html | 2 +- .../clients/create-client-dialog.component.html | 2 +- .../manage-client-subscription-dialog.component.html | 2 +- .../components/environment-selector.component.html | 2 +- .../src/angular/anon-layout/anon-layout.component.html | 2 +- libs/common/src/platform/services/state.service.ts | 4 ++-- libs/common/src/platform/state/derive-definition.ts | 2 +- libs/common/src/platform/state/key-definition.ts | 2 +- libs/common/src/platform/state/user-key-definition.ts | 2 +- .../src/tools/integration/integration-context.ts | 2 +- libs/common/src/tools/integration/rpc/rest-client.ts | 2 +- .../src/chip-select/chip-select.component.html | 6 +++--- .../components/src/dialog/dialog/dialog.component.html | 2 +- libs/components/src/layout/layout.component.html | 2 +- libs/components/src/navigation/nav-item.component.html | 10 +++++----- libs/components/src/navigation/side-nav.component.html | 4 ++-- libs/components/src/section/section.component.ts | 2 +- .../src/biometrics/biometric-state.service.ts | 2 +- .../generator/core/src/engine/email-calculator.ts | 2 +- .../generator/core/src/engine/email-randomizer.ts | 4 ++-- .../generator/core/src/engine/forwarder-context.ts | 4 ++-- .../core/src/engine/key-service-randomizer.ts | 2 +- .../core/src/policies/available-algorithms-policy.ts | 2 +- .../policies/passphrase-generator-options-evaluator.ts | 2 +- .../src/strategies/eff-username-generator-strategy.ts | 4 ++-- .../custom-fields/custom-fields.component.html | 2 +- .../item-history/item-history-v2.component.html | 2 +- 48 files changed, 69 insertions(+), 69 deletions(-) diff --git a/apps/browser/src/platform/popup/layout/popup-header.component.html b/apps/browser/src/platform/popup/layout/popup-header.component.html index 4fab1870767..fefc7154314 100644 --- a/apps/browser/src/platform/popup/layout/popup-header.component.html +++ b/apps/browser/src/platform/popup/layout/popup-header.component.html @@ -4,7 +4,7 @@ 'tw-bg-background-alt tw-border-transparent': this.background === 'alt' && !pageContentScrolled(), 'tw-bg-background tw-border-secondary-300': - (this.background === 'alt' && pageContentScrolled()) || this.background === 'default' + (this.background === 'alt' && pageContentScrolled()) || this.background === 'default', }" >
diff --git a/apps/browser/src/platform/popup/layout/popup-page.component.html b/apps/browser/src/platform/popup/layout/popup-page.component.html index 0c1bf410dcc..8a7bedf0882 100644 --- a/apps/browser/src/platform/popup/layout/popup-page.component.html +++ b/apps/browser/src/platform/popup/layout/popup-page.component.html @@ -6,7 +6,7 @@ [ngClass]="{ 'tw-invisible': loading || nonScrollable.childElementCount === 0, 'tw-border-secondary-300': scrolled(), - 'tw-border-transparent': !scrolled() + 'tw-border-transparent': !scrolled(), }" > diff --git a/apps/cli/src/tools/export.command.ts b/apps/cli/src/tools/export.command.ts index 71858a9c95d..51c96908909 100644 --- a/apps/cli/src/tools/export.command.ts +++ b/apps/cli/src/tools/export.command.ts @@ -38,7 +38,7 @@ export class ExportCommand { // format is 'undefined' => Defaults to 'csv' // Any other case => returns the options.format const format = - password && options.format == "json" ? "encrypted_json" : options.format ?? "csv"; + password && options.format == "json" ? "encrypted_json" : (options.format ?? "csv"); if (!this.isSupportedExportFormat(format)) { return Response.badRequest( diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/collection-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/filters/collection-filter.component.html index 28c815d8371..667cdf6798c 100644 --- a/apps/desktop/src/vault/app/vault/vault-filter/filters/collection-filter.component.html +++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/collection-filter.component.html @@ -13,7 +13,7 @@ aria-hidden="true" [ngClass]="{ 'bwi-angle-right': isCollapsed(collectionsGrouping), - 'bwi-angle-down': !isCollapsed(collectionsGrouping) + 'bwi-angle-down': !isCollapsed(collectionsGrouping), }" >  {{ collectionsGrouping.name | i18n }} @@ -42,7 +42,7 @@ aria-hidden="true" [ngClass]="{ 'bwi-angle-right': isCollapsed(c.node), - 'bwi-angle-down': !isCollapsed(c.node) + 'bwi-angle-down': !isCollapsed(c.node), }" > diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/folder-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/filters/folder-filter.component.html index 218a4c12692..a2240b03ff5 100644 --- a/apps/desktop/src/vault/app/vault/vault-filter/filters/folder-filter.component.html +++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/folder-filter.component.html @@ -13,7 +13,7 @@ aria-hidden="true" [ngClass]="{ 'bwi-angle-right': isCollapsed(foldersGrouping), - 'bwi-angle-down': !isCollapsed(foldersGrouping) + 'bwi-angle-down': !isCollapsed(foldersGrouping), }" >  {{ foldersGrouping.name | i18n }} @@ -33,7 +33,7 @@
  • @@ -52,7 +52,7 @@ aria-hidden="true" [ngClass]="{ 'bwi-angle-right': isCollapsed(f.node), - 'bwi-angle-down': !isCollapsed(f.node) + 'bwi-angle-down': !isCollapsed(f.node), }" > diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/organization-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/filters/organization-filter.component.html index 2740b229781..f77f279a96f 100644 --- a/apps/desktop/src/vault/app/vault/vault-filter/filters/organization-filter.component.html +++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/organization-filter.component.html @@ -15,7 +15,7 @@ aria-hidden="true" [ngClass]="{ 'bwi-angle-right': isCollapsed, - 'bwi-angle-down': !isCollapsed + 'bwi-angle-down': !isCollapsed, }" > @@ -74,7 +74,7 @@ aria-hidden="true" [ngClass]="{ 'bwi-angle-right': isCollapsed, - 'bwi-angle-down': !isCollapsed + 'bwi-angle-down': !isCollapsed, }" > diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html index 1df87a69ed6..381c06e8b67 100644 --- a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html +++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html @@ -12,7 +12,7 @@ aria-hidden="true" [ngClass]="{ 'bwi-angle-right': isCollapsed, - 'bwi-angle-down': !isCollapsed + 'bwi-angle-down': !isCollapsed, }" >  {{ typesNode.name | i18n }} diff --git a/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.html b/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.html index 05fff978b0c..34e9f734fc0 100644 --- a/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.html +++ b/apps/web/src/app/auth/settings/account/change-avatar-dialog.component.html @@ -26,7 +26,7 @@ title="{{ 'customColor' | i18n }}" [ngClass]="{ '!tw-outline-[3px] tw-outline-primary-600 hover:tw-outline-[3px] hover:tw-outline-primary-600': - customColorSelected + customColorSelected, }" class="tw-relative tw-flex tw-h-24 tw-w-24 tw-cursor-pointer tw-place-content-center tw-content-center tw-justify-center tw-rounded-full tw-border tw-border-solid tw-border-secondary-600 tw-outline tw-outline-0 tw-outline-offset-1 hover:tw-outline-1 hover:tw-outline-primary-300 focus:tw-outline-2 focus:tw-outline-primary-600" [style.background-color]="customColor$ | async" diff --git a/apps/web/src/app/auth/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html b/apps/web/src/app/auth/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html index 83327cfd805..9400e512c30 100644 --- a/apps/web/src/app/auth/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html +++ b/apps/web/src/app/auth/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html @@ -34,7 +34,7 @@ [organizationInfo]="{ name: orgInfoFormGroup.value.name, email: orgInfoFormGroup.value.billingEmail, - type: trialOrganizationType + type: trialOrganizationType, }" [subscriptionProduct]=" product === ProductType.SecretsManager diff --git a/apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html b/apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html index b827dc98bf4..1acf4c32097 100644 --- a/apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html +++ b/apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html @@ -33,7 +33,7 @@ [organizationInfo]="{ name: formGroup.get('name').value, email: formGroup.get('email').value, - type: productType + type: productType, }" [subscriptionProduct]="SubscriptionProduct.SecretsManager" (steppedBack)="steppedBack()" diff --git a/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html b/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html index d8e646c8d58..ed1dc6cda9b 100644 --- a/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html +++ b/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html @@ -102,7 +102,7 @@ [organizationInfo]="{ name: orgInfoFormGroup.get('name').value, email: orgInfoFormGroup.get('email').value, - type: trialOrganizationType + type: trialOrganizationType, }" [subscriptionProduct]="SubscriptionProduct.PasswordManager" (steppedBack)="previousStep()" diff --git a/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step-content.component.html b/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step-content.component.html index 06b1dc7c51a..5d7d3c62d2f 100644 --- a/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step-content.component.html +++ b/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step-content.component.html @@ -6,7 +6,7 @@ [disabled]="disabled" class="tw-flex tw-w-full tw-items-center tw-border-none tw-bg-transparent" [ngClass]="{ - 'hover:tw-bg-secondary-100': !disabled && step.editable + 'hover:tw-bg-secondary-100': !disabled && step.editable, }" [attr.aria-expanded]="selected" > @@ -16,7 +16,7 @@ [ngClass]="{ 'tw-bg-primary-600 tw-text-contrast': selected, 'tw-bg-secondary-300 tw-text-main': !selected && !disabled && step.editable, - 'tw-bg-transparent tw-text-muted': disabled + 'tw-bg-transparent tw-text-muted': disabled, }" > {{ stepNumber }} @@ -30,13 +30,13 @@

    {{ step.label }} diff --git a/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step.component.html b/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step.component.html index 427a4099175..1881df1c7f3 100644 --- a/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step.component.html +++ b/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step.component.html @@ -3,7 +3,7 @@ class="tw-inline-block tw-w-11/12 tw-pl-7" [ngClass]="{ 'tw-border-0 tw-border-l tw-border-solid tw-border-secondary-300': applyBorder, - 'tw-pt-6': addSubLabelSpacing + 'tw-pt-6': addSubLabelSpacing, }" > diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html index 69c89d2430f..e6ed6475c4a 100644 --- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html +++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html @@ -73,7 +73,7 @@ class="tw-bg-secondary-100 tw-text-center !tw-border-0 tw-text-sm tw-font-bold tw-py-1" [ngClass]="{ 'tw-bg-primary-700 !tw-text-contrast': selectableProduct === selectedPlan, - 'tw-bg-secondary-100': !(selectableProduct === selectedPlan) + 'tw-bg-secondary-100': !(selectableProduct === selectedPlan), }" > {{ "recommended" | i18n }} @@ -82,7 +82,7 @@ class="tw-px-2 tw-pb-[4px]" [ngClass]="{ 'tw-py-1': !(selectableProduct === selectedPlan), - 'tw-py-0': selectableProduct === selectedPlan + 'tw-py-0': selectableProduct === selectedPlan, }" >

    diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html index 55f72401946..41346675bbb 100644 --- a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html +++ b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html @@ -5,7 +5,7 @@
    diff --git a/apps/web/src/app/shared/components/onboarding/onboarding-task.component.html b/apps/web/src/app/shared/components/onboarding/onboarding-task.component.html index 6623ac4afb7..f0c0b01e06e 100644 --- a/apps/web/src/app/shared/components/onboarding/onboarding-task.component.html +++ b/apps/web/src/app/shared/components/onboarding/onboarding-task.component.html @@ -2,7 +2,7 @@ {{ title }} diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.html b/apps/web/src/app/vault/individual-vault/add-edit.component.html index 20852c89ae6..855b5dac489 100644 --- a/apps/web/src/app/vault/individual-vault/add-edit.component.html +++ b/apps/web/src/app/vault/individual-vault/add-edit.component.html @@ -497,7 +497,7 @@ aria-hidden="true" [ngClass]="{ 'bwi-eye': !showCardNumber, - 'bwi-eye-slash': showCardNumber + 'bwi-eye-slash': showCardNumber, }" > diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter.service.ts index 80d2d485481..a42b5228272 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter.service.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter.service.ts @@ -66,7 +66,7 @@ export class RoutedVaultFilterService implements OnDestroy { collectionId: filter.collectionId ?? null, folderId: filter.folderId ?? null, organizationId: - filter.organizationIdParamType === "path" ? null : filter.organizationId ?? null, + filter.organizationIdParamType === "path" ? null : (filter.organizationId ?? null), type: filter.type ?? null, }, queryParamsHandling: "merge", diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.html b/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.html index 4fd9f2a6ff7..bb52dd4feb7 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.html +++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.html @@ -25,7 +25,7 @@ >

     {{ headerNode.node.name | i18n }} @@ -44,7 +44,7 @@
  • @@ -62,7 +62,7 @@ class="bwi bwi-fw" [ngClass]="{ 'bwi-angle-right': isCollapsed(f.node), - 'bwi-angle-down': !isCollapsed(f.node) + 'bwi-angle-down': !isCollapsed(f.node), }" aria-hidden="true" > diff --git a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html index 530fd6087f4..914d015110b 100644 --- a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html +++ b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html @@ -263,7 +263,7 @@ aria-hidden="true" [ngClass]="{ 'bwi-angle-right': !showOpenIdCustomizations, - 'bwi-angle-down': showOpenIdCustomizations + 'bwi-angle-down': showOpenIdCustomizations, }" > diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.html b/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.html index 66ac422441a..ed58650f211 100644 --- a/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.html +++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/create-client-dialog.component.html @@ -61,7 +61,7 @@ class="tw-text-muted tw-grid tw-grid-flow-col tw-gap-1 tw-grid-cols-1" [ngClass]="{ 'tw-grid-rows-1': additionalSeatsPurchased <= 0, - 'tw-grid-rows-2': additionalSeatsPurchased > 0 + 'tw-grid-rows-2': additionalSeatsPurchased > 0, }" > diff --git a/libs/angular/src/auth/components/environment-selector.component.html b/libs/angular/src/auth/components/environment-selector.component.html index 06c5b470fe6..6a93e2a221a 100644 --- a/libs/angular/src/auth/components/environment-selector.component.html +++ b/libs/angular/src/auth/components/environment-selector.component.html @@ -1,6 +1,6 @@
    diff --git a/libs/auth/src/angular/anon-layout/anon-layout.component.html b/libs/auth/src/angular/anon-layout/anon-layout.component.html index 42bd4c460cd..8a0ac4b7186 100644 --- a/libs/auth/src/angular/anon-layout/anon-layout.component.html +++ b/libs/auth/src/angular/anon-layout/anon-layout.component.html @@ -5,7 +5,7 @@ 'tw-pt-0': decreaseTopPadding, 'tw-pt-8': !decreaseTopPadding, 'tw-min-h-screen': clientType === 'web', - 'tw-min-h-full': clientType === 'browser' || clientType === 'desktop' + 'tw-min-h-full': clientType === 'browser' || clientType === 'desktop', }" > diff --git a/libs/common/src/platform/services/state.service.ts b/libs/common/src/platform/services/state.service.ts index 03adb11f21e..d46a5189a48 100644 --- a/libs/common/src/platform/services/state.service.ts +++ b/libs/common/src/platform/services/state.service.ts @@ -404,11 +404,11 @@ export class StateService< } const account = options?.useSecureStorage - ? (await this.secureStorageService.get(options.userId, options)) ?? + ? ((await this.secureStorageService.get(options.userId, options)) ?? (await this.storageService.get( options.userId, this.reconcileOptions(options, { htmlStorageLocation: HtmlStorageLocation.Local }), - )) + ))) : await this.storageService.get(options.userId, options); return account; } diff --git a/libs/common/src/platform/state/derive-definition.ts b/libs/common/src/platform/state/derive-definition.ts index 8f62d3a342c..826608b574c 100644 --- a/libs/common/src/platform/state/derive-definition.ts +++ b/libs/common/src/platform/state/derive-definition.ts @@ -164,7 +164,7 @@ export class DeriveDefinition { * Gets the number of milliseconds to wait before cleaning up the state after the last subscriber has unsubscribed. */ get cleanupDelayMs() { - return this.options.cleanupDelayMs < 0 ? 0 : this.options.cleanupDelayMs ?? 1000; + return this.options.cleanupDelayMs < 0 ? 0 : (this.options.cleanupDelayMs ?? 1000); } /** diff --git a/libs/common/src/platform/state/user-key-definition.ts b/libs/common/src/platform/state/user-key-definition.ts index 397e12d774f..1548ab2a7c1 100644 --- a/libs/common/src/platform/state/user-key-definition.ts +++ b/libs/common/src/platform/state/user-key-definition.ts @@ -63,7 +63,7 @@ export class UserKeyDefinition { * Gets the number of milliseconds to wait before cleaning up the state after the last subscriber has unsubscribed. */ get cleanupDelayMs() { - return this.options.cleanupDelayMs < 0 ? 0 : this.options.cleanupDelayMs ?? 1000; + return this.options.cleanupDelayMs < 0 ? 0 : (this.options.cleanupDelayMs ?? 1000); } /** diff --git a/libs/common/src/tools/integration/integration-context.ts b/libs/common/src/tools/integration/integration-context.ts index b527e79ce9e..3debf54ba36 100644 --- a/libs/common/src/tools/integration/integration-context.ts +++ b/libs/common/src/tools/integration/integration-context.ts @@ -60,7 +60,7 @@ export class IntegrationContext { options: { base64?: boolean; suffix?: string } = null, ): Settings extends ApiSettings ? string : never { // normalize `token` then assert it has a value - let token = "token" in this.settings ? (this.settings.token as string) ?? "" : ""; + let token = "token" in this.settings ? ((this.settings.token as string) ?? "") : ""; if (token === "") { const error = this.i18n.t("forwaderInvalidToken", this.metadata.name); throw error; diff --git a/libs/common/src/tools/integration/rpc/rest-client.ts b/libs/common/src/tools/integration/rpc/rest-client.ts index 3cfb8adce1f..c9096d0ce1d 100644 --- a/libs/common/src/tools/integration/rpc/rest-client.ts +++ b/libs/common/src/tools/integration/rpc/rest-client.ts @@ -91,7 +91,7 @@ export class RestClient { const message = parsed.message?.toString() ?? null; // `false` signals no message found - const result = error && message ? `${error}: ${message}` : error ?? message ?? false; + const result = error && message ? `${error}: ${message}` : (error ?? message ?? false); return result; } diff --git a/libs/components/src/chip-select/chip-select.component.html b/libs/components/src/chip-select/chip-select.component.html index 69181f9c87d..eb4ea89387e 100644 --- a/libs/components/src/chip-select/chip-select.component.html +++ b/libs/components/src/chip-select/chip-select.component.html @@ -6,7 +6,7 @@ ? 'tw-bg-text-muted tw-text-contrast tw-gap-1' : 'tw-bg-transparent tw-text-muted tw-gap-1.5', focusVisibleWithin() ? 'tw-ring-2 tw-ring-primary-500 tw-ring-offset-1' : '', - fullWidth ? 'tw-w-full' : 'tw-max-w-52' + fullWidth ? 'tw-w-full' : 'tw-max-w-52', ]" > @@ -14,7 +14,7 @@ type="button" class="fvw-target tw-inline-flex tw-gap-1.5 tw-items-center tw-justify-between tw-bg-transparent hover:tw-bg-transparent tw-border-none tw-outline-none tw-w-full tw-py-1 tw-pl-3 last:tw-pr-3 tw-truncate tw-text-[inherit]" [ngClass]="{ - 'tw-cursor-not-allowed': disabled + 'tw-cursor-not-allowed': disabled, }" [bitMenuTriggerFor]="menu" [disabled]="disabled" @@ -40,7 +40,7 @@ [disabled]="disabled" class="tw-bg-transparent hover:tw-bg-transparent tw-outline-none tw-rounded-full tw-p-1 tw-my-1 tw-mr-1 tw-text-[inherit] tw-border-solid tw-border tw-border-text-muted hover:tw-border-text-contrast hover:disabled:tw-border-transparent tw-aspect-square tw-flex tw-items-center tw-justify-center tw-h-fit focus-visible:tw-ring-2 tw-ring-text-contrast focus-visible:hover:tw-border-transparent" [ngClass]="{ - 'tw-cursor-not-allowed': disabled + 'tw-cursor-not-allowed': disabled, }" (click)="clear()" > diff --git a/libs/components/src/dialog/dialog/dialog.component.html b/libs/components/src/dialog/dialog/dialog.component.html index 6f38f3d64e8..c07239af6d6 100644 --- a/libs/components/src/dialog/dialog/dialog.component.html +++ b/libs/components/src/dialog/dialog/dialog.component.html @@ -38,7 +38,7 @@ 'tw-overflow-y-auto': !loading, 'tw-invisible tw-overflow-y-hidden': loading, 'tw-bg-background': background === 'default', - 'tw-bg-background-alt': background === 'alt' + 'tw-bg-background-alt': background === 'alt', }" > diff --git a/libs/components/src/layout/layout.component.html b/libs/components/src/layout/layout.component.html index 2daefce556e..56c0af8f0db 100644 --- a/libs/components/src/layout/layout.component.html +++ b/libs/components/src/layout/layout.component.html @@ -25,7 +25,7 @@
    @@ -30,7 +30,7 @@