diff --git a/apps/browser/src/popup/scss/base.scss b/apps/browser/src/popup/scss/base.scss index eb467d7d3a9..0e5d5873e9b 100644 --- a/apps/browser/src/popup/scss/base.scss +++ b/apps/browser/src/popup/scss/base.scss @@ -95,7 +95,7 @@ textarea:not(bit-form-field textarea) { input, select, textarea, -button { +button:not(bit-chip-select button) { font-size: $font-size-base; font-family: $font-family-sans-serif; } diff --git a/libs/components/src/chip-select/chip-select.component.html b/libs/components/src/chip-select/chip-select.component.html index d74e3d9cef1..1d377e5cb98 100644 --- a/libs/components/src/chip-select/chip-select.component.html +++ b/libs/components/src/chip-select/chip-select.component.html @@ -1,6 +1,6 @@
{{ label }} @@ -37,7 +37,7 @@ type="button" [attr.aria-label]="'removeItem' | i18n: label" [disabled]="disabled" - class="tw-bg-transparent hover:tw-bg-transparent tw-outline-none tw-rounded-full tw-p-1 tw-px-1.5 tw-my-[0.175rem] tw-mr-2 tw-text-[inherit] tw-border-solid tw-border tw-border-transparent hover:tw-border-text-contrast hover:disabled:tw-border-transparent tw-flex tw-items-center tw-justify-center focus-visible:tw-ring-2 tw-ring-text-contrast focus-visible:hover:tw-border-transparent" + class="tw-bg-transparent hover:tw-bg-transparent tw-outline-none tw-rounded-full tw-py-0.5 tw-px-1 tw-mr-1 tw-text-[color:inherit] tw-text-[length:inherit] tw-border-solid tw-border tw-border-transparent hover:tw-border-text-contrast hover:disabled:tw-border-transparent tw-flex tw-items-center tw-justify-center focus-visible:tw-ring-2 tw-ring-text-contrast focus-visible:hover:tw-border-transparent" [ngClass]="{ 'tw-cursor-not-allowed': disabled, }" @@ -55,6 +55,7 @@ bitMenuItem (click)="viewOption(parent, $event)" [title]="parent.label ? ('backTo' | i18n: parent.label) : ('back' | i18n)" + class="tw-text-[length:inherit]" > {{ parent.label ? ("backTo" | i18n: parent.label) : ("back" | i18n) }} @@ -65,6 +66,7 @@ bitMenuItem (click)="selectOption(renderedOptions, $event)" [title]="'viewItemsIn' | i18n: renderedOptions.label" + class="tw-text-[length:inherit]" > {{ "viewItemsIn" | i18n: renderedOptions.label }} @@ -78,6 +80,7 @@ (click)="option.children?.length ? viewOption(option, $event) : selectOption(option, $event)" [disabled]="option.disabled" [title]="option.label" + class="tw-text-[length:inherit]" >
@@ -104,7 +104,7 @@
diff --git a/libs/components/src/form-field/form-field.component.ts b/libs/components/src/form-field/form-field.component.ts index a32bbe7543d..fd0d62bdda3 100644 --- a/libs/components/src/form-field/form-field.component.ts +++ b/libs/components/src/form-field/form-field.component.ts @@ -69,7 +69,9 @@ export class BitFormFieldComponent implements AfterContentChecked { @HostBinding("class") get classList() { - return ["tw-block", "tw-pt-2"].concat(this.disableMargin ? [] : ["tw-mb-4"]); + return ["tw-block"] + .concat(this.disableMargin ? [] : ["tw-mb-4"]) + .concat(this.readOnly ? [] : "tw-pt-2"); } /** diff --git a/libs/components/src/item/item-content.component.html b/libs/components/src/item/item-content.component.html index c8d83bc51fc..ba0309f3c28 100644 --- a/libs/components/src/item/item-content.component.html +++ b/libs/components/src/item/item-content.component.html @@ -2,10 +2,10 @@
-
+
-
+
diff --git a/libs/components/src/item/item-content.component.ts b/libs/components/src/item/item-content.component.ts index 98e5be97e5b..5c1b464de93 100644 --- a/libs/components/src/item/item-content.component.ts +++ b/libs/components/src/item/item-content.component.ts @@ -8,10 +8,12 @@ import { ViewChild, } from "@angular/core"; +import { TypographyModule } from "../typography"; + @Component({ selector: "bit-item-content, [bit-item-content]", standalone: true, - imports: [CommonModule], + imports: [CommonModule, TypographyModule], templateUrl: `item-content.component.html`, host: { class: diff --git a/libs/components/src/item/item.stories.ts b/libs/components/src/item/item.stories.ts index f307d7dbbd0..cea19d8ec17 100644 --- a/libs/components/src/item/item.stories.ts +++ b/libs/components/src/item/item.stories.ts @@ -43,7 +43,7 @@ export const Default: Story = { template: /*html*/ ` @@ -115,7 +115,7 @@ export const TextOverflow: Story = { template: /*html*/ ` - + Helloooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo! Worlddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd! @@ -139,7 +139,7 @@ export const MultipleActionList: Story = { @@ -158,7 +158,7 @@ export const MultipleActionList: Story = { @@ -177,7 +177,7 @@ export const MultipleActionList: Story = { @@ -196,7 +196,7 @@ export const MultipleActionList: Story = { @@ -215,7 +215,7 @@ export const MultipleActionList: Story = { @@ -234,7 +234,7 @@ export const MultipleActionList: Story = { @@ -312,7 +312,7 @@ export const VirtualScrolling: Story = { diff --git a/libs/vault/src/components/totp-countdown/totp-countdown.component.html b/libs/vault/src/components/totp-countdown/totp-countdown.component.html index ba4ff04a093..7de19ac3edd 100644 --- a/libs/vault/src/components/totp-countdown/totp-countdown.component.html +++ b/libs/vault/src/components/totp-countdown/totp-countdown.component.html @@ -12,8 +12,8 @@ class="tw-fill-none" [ngClass]="{ 'tw-stroke-text-main': !totpLow, 'tw-stroke-danger-600': totpLow }" r="9.5" - cy="11.8" - cx="11.8" + cy="14" + cx="14" stroke-width="2" stroke-dasharray="60" [ngStyle]="{ 'stroke-dashoffset.px': totpDash }" @@ -22,8 +22,8 @@ class="tw-fill-none" [ngClass]="{ 'tw-stroke-text-main': !totpLow, 'tw-stroke-danger-600': totpLow }" r="11" - cy="11.8" - cx="11.8" + cy="14" + cx="14" stroke-width="1" stroke-dasharray="71" stroke-dashoffset="0"