diff --git a/packages/theme/styles/components.scss b/packages/theme/styles/components.scss index c87b9e7061..0521d96542 100644 --- a/packages/theme/styles/components.scss +++ b/packages/theme/styles/components.scss @@ -1028,6 +1028,25 @@ } } +/* Presenters */ +.antiPresenter { + display: flex; + align-items: center; + flex-wrap: nowrap; + min-width: 0; + + .ap-icon { color: var(--theme-dark-color); } + .ap-label { + min-width: 0; + text-align: left; + color: var(--theme-caption-color); + + &.colorInherit { color: inherit; } + } + &:hover .ap-icon, + &:hover .ap-label { color: var(--theme-caption-color); } +} + /* ListView - global style */ .list-container .category-container .categoryHeader.subLevel.closed { border-radius: 0 0 0.25rem 0.25rem; diff --git a/plugins/contact-resources/src/components/PersonContent.svelte b/plugins/contact-resources/src/components/PersonContent.svelte index 3cb0139301..c921284e81 100644 --- a/plugins/contact-resources/src/components/PersonContent.svelte +++ b/plugins/contact-resources/src/components/PersonContent.svelte @@ -24,10 +24,10 @@ themeStore, tooltip } from '@hcengineering/ui' - import { DocNavLink } from '@hcengineering/view-resources' import { createEventDispatcher, onMount } from 'svelte' import Avatar from './Avatar.svelte' import { getClient } from '@hcengineering/presentation' + import PersonElement from './PersonElement.svelte' export let value: Person | Employee | undefined | null export let inline: boolean = false @@ -56,6 +56,7 @@ } const dispatch = createEventDispatcher() + $: name = value ? getName(client.getHierarchy(), value) : '' $: accentColor = value?.name !== undefined ? getPlatformAvatarColorForTextDef(value?.name ?? '', $themeStore.dark) @@ -69,59 +70,61 @@ {#if value} - - {#if inline} - - @{getName(client.getHierarchy(), value)} - - {:else} - - {#if shouldShowAvatar} - - - - {/if} - {#if shouldShowName} - {getName(client.getHierarchy(), value)} - {/if} - - {/if} - {#if statusLabel} - - +
+ + + +
+ {:else} + {/if} {:else if shouldShowPlaceholder} {#if !inline && shouldShowAvatar} - + {/if} {#if shouldShowName && defaultName} - + {/if} @@ -129,44 +132,10 @@ {/if}