diff --git a/models/chunter/src/index.ts b/models/chunter/src/index.ts index 52a60cf306..43e3525849 100644 --- a/models/chunter/src/index.ts +++ b/models/chunter/src/index.ts @@ -439,7 +439,7 @@ export function createModel (builder: Builder, options = { addApplication: true icon: chunter.icon.Chunter, txClass: core.class.TxCreateDoc, component: chunter.activity.TxCommentCreate, - label: chunter.string.LeftComment, + // label: chunter.string.LeftComment, display: 'content', editable: true, hideOnRemove: true diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss index 69b76f31bb..84bb132790 100644 --- a/packages/theme/styles/_layouts.scss +++ b/packages/theme/styles/_layouts.scss @@ -370,7 +370,7 @@ input.search { min-width: 0; & > * { - margin-right: 0.5rem; + margin-right: 0.25rem; } & > *:last-child { margin-right: 0; diff --git a/packages/theme/styles/global.scss b/packages/theme/styles/global.scss index ff8ba946bd..1c238733fc 100644 --- a/packages/theme/styles/global.scss +++ b/packages/theme/styles/global.scss @@ -111,6 +111,7 @@ body { text-rendering: optimizeLegibility; font-family: var(--font-family); + font-style: normal; font-weight: 400; font-size: var(--body-font-size); color: var(--content-color); diff --git a/packages/ui/src/components/ActionIcon.svelte b/packages/ui/src/components/ActionIcon.svelte index 07488d08f9..5b721c27b3 100644 --- a/packages/ui/src/components/ActionIcon.svelte +++ b/packages/ui/src/components/ActionIcon.svelte @@ -56,7 +56,7 @@ color: var(--accent-color); opacity: 1; } - &:focus { + &:focus-visible { border: 1px solid var(--primary-button-focused-border); box-shadow: 0 0 0 3px var(--primary-button-outline); .icon { diff --git a/plugins/activity-resources/src/components/TxView.svelte b/plugins/activity-resources/src/components/TxView.svelte index a4036ba108..0939005d2b 100644 --- a/plugins/activity-resources/src/components/TxView.svelte +++ b/plugins/activity-resources/src/components/TxView.svelte @@ -28,8 +28,7 @@ Label, ShowMore, showPopup, - TimeSince, - Like + TimeSince } from '@hcengineering/ui' import type { AttributeModel } from '@hcengineering/view' import { Menu, ObjectPresenter } from '@hcengineering/view-resources' @@ -155,15 +154,9 @@ {#if (viewlet !== undefined && !((viewlet?.hideOnRemove ?? false) && tx.removed)) || model.length > 0} -
+
{#if showIcon} - {#if isComment || isMention} + {#if isComment}
@@ -192,15 +185,13 @@ {#if viewlet && viewlet?.editable} - - {#if viewlet.label} - + {#if viewlet.label} + + {/if} + {#if tx.updated} + + {/if} + {:else if viewlet && viewlet.label}
{#if isComment}
- + {#if tx.tx.modifiedBy === getCurrentAccount()._id} {/if} @@ -305,7 +296,7 @@ {/if} {#if viewlet && viewlet.display !== 'inline'} -
+
{#if tx.collectionAttribute !== undefined && (tx.txDocIds?.size ?? 0) > 1}
@@ -341,10 +332,6 @@ display: flex; justify-content: space-between; - &:hover .time { - opacity: 1; - } - .msgactivity-icon, .msgactivity-avatar { display: flex; @@ -379,7 +366,7 @@ } .msgactivity-content__title { display: inline-flex; - align-items: center; + align-items: baseline; flex-grow: 1; } @@ -387,6 +374,16 @@ flex-direction: column; padding-bottom: 0.25rem; } + &.comment { + .activity-content { + margin-top: 0.25rem; + } + } + &:not(.comment) { + .msgactivity-content__header { + min-height: 1.75rem; + } + } &:not(.content) { align-items: center; @@ -450,14 +447,10 @@ .time { font-size: 0.75rem; color: var(--trans-color); - opacity: 0.3; &.top { align-self: flex-start; } - .comment & { - opacity: 1; - } } .message { @@ -467,7 +460,7 @@ .activity-content { overflow: hidden; visibility: visible; - margin-top: 0.25rem; + margin-top: 0.125rem; max-height: max-content; opacity: 1; transition-property: max-height, opacity; diff --git a/plugins/attachment-assets/assets/icons.svg b/plugins/attachment-assets/assets/icons.svg index 4291cb688e..b0ed4c5521 100644 --- a/plugins/attachment-assets/assets/icons.svg +++ b/plugins/attachment-assets/assets/icons.svg @@ -1,13 +1,7 @@ - - - - - - - - + + diff --git a/plugins/attachment-assets/src/index.ts b/plugins/attachment-assets/src/index.ts index 5db2470c5e..c8d55aa981 100644 --- a/plugins/attachment-assets/src/index.ts +++ b/plugins/attachment-assets/src/index.ts @@ -18,7 +18,7 @@ import attachment, { attachmentId } from '@hcengineering/attachment' const icons = require('../assets/icons.svg') as string // eslint-disable-line loadMetadata(attachment.icon, { - Attachment: `${icons}#chunter`, + Attachment: `${icons}#attachment`, FileBrowser: `${icons}#fileBrowser` }) diff --git a/plugins/tracker-assets/assets/icons.svg b/plugins/tracker-assets/assets/icons.svg index 4f93e18bb8..e33413efc9 100644 --- a/plugins/tracker-assets/assets/icons.svg +++ b/plugins/tracker-assets/assets/icons.svg @@ -29,8 +29,7 @@ - - + diff --git a/plugins/tracker-resources/src/components/components/ComponentPresenter.svelte b/plugins/tracker-resources/src/components/components/ComponentPresenter.svelte index d63b980009..139edb966f 100644 --- a/plugins/tracker-resources/src/components/components/ComponentPresenter.svelte +++ b/plugins/tracker-resources/src/components/components/ComponentPresenter.svelte @@ -22,6 +22,7 @@ export let shouldShowAvatar = true export let onClick: () => void | undefined export let isInteractive = true + export let inline: boolean = false function navigateToComponent () { if (!isInteractive) { @@ -43,7 +44,7 @@ {#if value}
- {#if shouldShowAvatar} + {#if !inline && shouldShowAvatar}
diff --git a/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte b/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte index fbadfc2405..3dbc677862 100644 --- a/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte +++ b/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte @@ -49,7 +49,7 @@ {#if value} - {#if shouldShowAvatar} + {#if !inline && shouldShowAvatar}
diff --git a/plugins/tracker-resources/src/components/issues/StatusPresenter.svelte b/plugins/tracker-resources/src/components/issues/StatusPresenter.svelte index 846159bfca..1fb884bbff 100644 --- a/plugins/tracker-resources/src/components/issues/StatusPresenter.svelte +++ b/plugins/tracker-resources/src/components/issues/StatusPresenter.svelte @@ -19,15 +19,16 @@ export let value: IssueStatus | undefined export let size: 'small' | 'medium' = 'small' + export let inline: boolean = false {#if value} {@const icon = $statusStore.byId.get(value._id)?.$lookup?.category?.icon}
- {#if icon} + {#if !inline && icon} {/if} - + {value.name}
diff --git a/plugins/tracker-resources/src/components/sprints/SprintPresenter.svelte b/plugins/tracker-resources/src/components/sprints/SprintPresenter.svelte index 86f4cd1096..b07beb92c3 100644 --- a/plugins/tracker-resources/src/components/sprints/SprintPresenter.svelte +++ b/plugins/tracker-resources/src/components/sprints/SprintPresenter.svelte @@ -22,6 +22,7 @@ export let shouldShowAvatar: boolean = true export let onClick: () => void | undefined export let isInteractive = true + export let inline: boolean = false function navigateToSprint () { if (!isInteractive) { @@ -42,7 +43,7 @@ {#if value}
- {#if shouldShowAvatar} + {#if !inline && shouldShowAvatar}
diff --git a/plugins/tracker-resources/src/components/templates/IssueTemplatePresenter.svelte b/plugins/tracker-resources/src/components/templates/IssueTemplatePresenter.svelte index 7246bd0e94..c3a7a540c1 100644 --- a/plugins/tracker-resources/src/components/templates/IssueTemplatePresenter.svelte +++ b/plugins/tracker-resources/src/components/templates/IssueTemplatePresenter.svelte @@ -19,9 +19,10 @@ import tracker from '../../plugin' export let value: WithLookup - // export let inline: boolean = false export let disableClick = false export let noUnderline = false + export let shouldShowAvatar: boolean = true + export let inline: boolean = false function handleIssueEditorOpened () { if (disableClick) { @@ -36,9 +37,11 @@ {#if value} -
- -
+ {#if !inline && shouldShowAvatar} +
+ +
+ {/if} {title}