mirror of
https://github.com/bitwarden/browser
synced 2026-02-28 02:23:25 +00:00
fix things from merges and changes
This commit is contained in:
@@ -31,7 +31,6 @@
|
||||
<td bitCell>
|
||||
<div class="tw-flex tw-items-center">
|
||||
<bit-avatar
|
||||
size="sm"
|
||||
[text]="u | userName"
|
||||
[id]="u.userId"
|
||||
[color]="u.avatarColor"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
</div>
|
||||
<div class="tw-col-span-12 @3xl:tw-col-span-6 tw-row-start-1 @3xl:tw-row-start-auto">
|
||||
<div class="tw-mb-3 tw-flex tw-align-middle tw-items-center">
|
||||
<dynamic-avatar text="{{ profile | userName }}" [id]="profile.id" size="2xlarge">
|
||||
<dynamic-avatar text="{{ profile | userName }}" [id]="profile.id" size="2xl">
|
||||
</dynamic-avatar>
|
||||
<button
|
||||
class="tw-ml-3"
|
||||
|
||||
@@ -76,8 +76,6 @@ export function isAvatarColor(color: string | undefined): color is AvatarColor {
|
||||
templateUrl: "avatar.component.html",
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
host: {
|
||||
"(mouseenter)": "isHovering.set(true)",
|
||||
"(mouseleave)": "isHovering.set(false)",
|
||||
class:
|
||||
"tw-leading-[0px] focus-visible:tw-outline-none tw-rounded-full focus-visible:tw-ring-2 focus-visible:tw-ring-offset-1 focus-visible:tw-ring-border-focus !focus-visible:tw-border-[transparent] focus-visible:tw-z-10 tw-group/avatar aria-disabled:tw-cursor-not-allowed",
|
||||
"[style.--avatar-bg]": "avatarBgColors().avatarBgColor",
|
||||
|
||||
@@ -38,8 +38,7 @@ is rare for an avatar button to be inactive, this state is supported as well.
|
||||
|
||||
## Sizes
|
||||
|
||||
There are multiple sizes available for the Avatar:
|
||||
`"2xlarge" | "xlarge" | "large" | "base" | "small"`
|
||||
There are multiple sizes available for the Avatar: `"2xl" | "xl" | "lg" | "base" | "sm"`
|
||||
|
||||
<Canvas of={stories.Sizes} />
|
||||
|
||||
|
||||
Reference in New Issue
Block a user