diff --git a/packages/ui/src/components/ShowMore.svelte b/packages/ui/src/components/ShowMore.svelte index b505e39e4d3..d5831488a9b 100644 --- a/packages/ui/src/components/ShowMore.svelte +++ b/packages/ui/src/components/ShowMore.svelte @@ -26,7 +26,8 @@ let cHeight: number let crop: boolean = false - const toggle = (): void => { + const toggle = (event: MouseEvent): void => { + event.stopPropagation() crop = !crop } diff --git a/plugins/card-resources/src/components/CardPathPresenter.svelte b/plugins/card-resources/src/components/CardPathPresenter.svelte index f277bf8334f..e69556828bb 100644 --- a/plugins/card-resources/src/components/CardPathPresenter.svelte +++ b/plugins/card-resources/src/components/CardPathPresenter.svelte @@ -18,7 +18,7 @@ import { WithLookup } from '@hcengineering/core' import { Icon, tooltip } from '@hcengineering/ui' import { getEmbeddedLabel } from '@hcengineering/platform' - import { IconForward } from '@hcengineering/presentation' + import TagDivider from './TagDivider.svelte' import { openCardInSidebar } from '../utils' import CardIcon from './CardIcon.svelte' @@ -38,7 +38,7 @@ {/if} {#if card.parent != null} {#if displaySpace && card.$lookup?.space !== undefined} - + {/if} {@const info = card.parentInfo?.find((it) => it._id === card.parent)} {#if info} @@ -73,7 +73,7 @@ border-radius: var(--extra-small-BorderRadius); white-space: nowrap; gap: 0.25rem; - background: var(--global-ui-hover-BackgroundColor); + background-color: var(--global-ui-BackgroundColor); border: var(--global-subtle-ui-BorderColor); color: var(--global-secondary-TextColor); cursor: pointer; diff --git a/plugins/card-resources/src/components/ColoredCardIcon.svelte b/plugins/card-resources/src/components/ColoredCardIcon.svelte new file mode 100644 index 00000000000..5db0f8d2772 --- /dev/null +++ b/plugins/card-resources/src/components/ColoredCardIcon.svelte @@ -0,0 +1,84 @@ + + + + +
+ + + {#if count > 0} +
+ +
+ {/if} +
+ + diff --git a/plugins/card-resources/src/components/ContentPreview.svelte b/plugins/card-resources/src/components/ContentPreview.svelte new file mode 100644 index 00000000000..615ec9a9c75 --- /dev/null +++ b/plugins/card-resources/src/components/ContentPreview.svelte @@ -0,0 +1,69 @@ + + + + +
+ +
+ +
+
+
+ + diff --git a/plugins/card-resources/src/components/FeedCardPresenter.svelte b/plugins/card-resources/src/components/FeedCardPresenter.svelte index ff26c11e531..05dcd7ec3e3 100644 --- a/plugins/card-resources/src/components/FeedCardPresenter.svelte +++ b/plugins/card-resources/src/components/FeedCardPresenter.svelte @@ -13,22 +13,25 @@ @@ -67,13 +77,7 @@
openCardInSidebar(card._id, card)}>
- {#if socialId !== core.account.System} - - - - {:else} - - {/if} +
@@ -86,38 +90,44 @@ {/if} - {card.title} + {truncatedTitle}
{#if !isComfortable2}
- -
- +
{/if}
- {#if message} - {#if isCompact} - - {:else} - - {/if} + {#if isThreadCard && message} + + {:else if !isThreadCard && card.content} + {/if}
+ {#if isComfortable2}
- +
- +
{/if} @@ -245,7 +255,6 @@ height: 0.5rem; } .tags-container { - min-width: 14rem; max-width: none; flex-grow: 1; } diff --git a/plugins/card-resources/src/components/NotifyMarker.svelte b/plugins/card-resources/src/components/NotifyMarker.svelte new file mode 100644 index 00000000000..433ceb2bd24 --- /dev/null +++ b/plugins/card-resources/src/components/NotifyMarker.svelte @@ -0,0 +1,59 @@ + + + +
+ + diff --git a/plugins/card-resources/src/components/TagDivider.svelte b/plugins/card-resources/src/components/TagDivider.svelte new file mode 100644 index 00000000000..9052915f25f --- /dev/null +++ b/plugins/card-resources/src/components/TagDivider.svelte @@ -0,0 +1,23 @@ + + + + + + + + + + + + + +
+ + diff --git a/plugins/chat-resources/src/components/ChatApplication.svelte b/plugins/chat-resources/src/components/ChatApplication.svelte index 92fb6da686e..a83f6f2e263 100644 --- a/plugins/chat-resources/src/components/ChatApplication.svelte +++ b/plugins/chat-resources/src/components/ChatApplication.svelte @@ -14,7 +14,7 @@ -->