1
0
mirror of https://github.com/bitwarden/browser synced 2026-02-04 02:33:33 +00:00

move flex styles to template to fix some minor style overrides

This commit is contained in:
Bryan Cunningham
2026-01-26 17:15:22 -05:00
parent d95a5ef3d7
commit 4702dd9777
3 changed files with 14 additions and 13 deletions

View File

@@ -1,9 +1,11 @@
@if (startIcon()) {
<i [class]="['bwi', startIcon()]" aria-hidden="true"></i>
}
<span>
<ng-content></ng-content>
<span class="tw-flex tw-gap-2 tw-items-center">
@if (startIcon()) {
<i [class]="['bwi', startIcon()]" aria-hidden="true"></i>
}
<span>
<ng-content></ng-content>
</span>
@if (endIcon()) {
<i [class]="['bwi', endIcon()]" aria-hidden="true"></i>
}
</span>
@if (endIcon()) {
<i [class]="['bwi', endIcon()]" aria-hidden="true"></i>
}

View File

@@ -51,9 +51,6 @@ const commonStyles = [
"tw-border-0",
"tw-border-none",
"tw-rounded",
"tw-inline-flex",
"tw-items-center",
"tw-gap-2",
"tw-transition",
"tw-no-underline",
"tw-cursor-pointer",
@@ -137,7 +134,9 @@ export class LinkComponent {
readonly classList = computed(() => {
const verticalInset = this.isButton ? "0.25rem" : "0.125rem";
return [`before:-tw-inset-y-[${verticalInset}]`]
const displayStyle = this.isButton ? "inline-block" : "inline-flex";
return [`before:-tw-inset-y-[${verticalInset}]`, `tw-${displayStyle}`]
.concat(commonStyles)
.concat(linkStyles[this.linkType()] ?? []);
});

View File

@@ -261,7 +261,7 @@ export const WithIcons: Story = {
<a bitLink [linkType]="linkType" href="#" endIcon="bwi-external-link">External link</a>
</div>
<div class="tw-block tw-p-2">
<a bitLink [linkType]="linkType" href="#" startIcon="bwi-arrow-left" endIcon="bwi-arrow-right">Both icons</a>
<a bitLink [linkType]="linkType" href="#" startIcon="bwi-angle-left" endIcon="bwi-angle-right">Both icons</a>
</div>
<div class="tw-block tw-p-2">
<button type="button" bitLink [linkType]="linkType" startIcon="bwi-plus-circle">Add item</button>