From b2fe37e5409bbb0b1981aab712566b46ce8fa18c Mon Sep 17 00:00:00 2001
From: Alexander Platov <sas_lord@mail.ru>
Date: Wed, 5 Apr 2023 10:04:34 +0300
Subject: [PATCH] TSK-1020. Highlighting the subject name only in comments and
 attachments (#2884)

Signed-off-by: Alexander Platov <sas_lord@mail.ru>
---
 packages/theme/styles/_layouts.scss             | 17 +++++------------
 packages/theme/styles/global.scss               |  2 ++
 .../src/components/TxView.svelte                | 17 +++++++----------
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss
index 84bb132790..730f6a8bf2 100644
--- a/packages/theme/styles/_layouts.scss
+++ b/packages/theme/styles/_layouts.scss
@@ -369,22 +369,15 @@ input.search {
   flex-wrap: wrap;
   min-width: 0;
 
-  & > * {
-    margin-right: 0.25rem;
-  }
-  & > *:last-child {
-    margin-right: 0;
-  }
+  & > * { margin-right: 0.25rem; }
+  & > *:last-child { margin-right: 0; }
+
   .bold {
     font-weight: 500;
     color: var(--caption-color);
   }
-  .strong {
-    color: var(--accent-color);
-  }
-  .lower {
-    text-transform: lowercase;
-  }
+  .strong { color: var(--accent-color); }
+  .lower { text-transform: lowercase; }
 }
 
 .gap-1, .gap-1-5 {
diff --git a/packages/theme/styles/global.scss b/packages/theme/styles/global.scss
index 3cceabd6c8..01f4b68085 100644
--- a/packages/theme/styles/global.scss
+++ b/packages/theme/styles/global.scss
@@ -130,3 +130,5 @@ body {
 // TSK-1026. Experiment, don't forget to delete.
 .theme-dark .p-activity .msgactivity-content.comment .msgactivity-content__title.labels-row > .bold,
 .theme-dark .p-activity .msgactivity-content.comment .activity-content.content .p-inline { color: rgba(255, 255, 255, .8); }
+.theme-light .p-activity .msgactivity-content.comment .msgactivity-content__title.labels-row > .bold,
+.theme-light .p-activity .msgactivity-content.comment .activity-content.content .p-inline { color: rgba(0, 0, 0, .8); }
diff --git a/plugins/activity-resources/src/components/TxView.svelte b/plugins/activity-resources/src/components/TxView.svelte
index e524060b34..e49c4b70d8 100644
--- a/plugins/activity-resources/src/components/TxView.svelte
+++ b/plugins/activity-resources/src/components/TxView.svelte
@@ -186,7 +186,7 @@
     <div class="msgactivity-content" class:content={isColumn} class:comment={isComment || isAttach}>
       <div class="msgactivity-content__header">
         <div class="msgactivity-content__title labels-row">
-          <span class="bold">
+          <span class={isComment || isAttach ? 'bold' : 'strong'}>
             {#if employee}
               {getName(employee)}
             {:else}
@@ -201,7 +201,7 @@
             {#if tx.updated}
               <span class="lower"><Label label={activity.string.Edited} /></span>
             {/if}
-            <span class="time"><TimeSince value={tx.tx.modifiedOn} /></span>
+            <span class="time ml-1"><TimeSince value={tx.tx.modifiedOn} /></span>
           {:else if viewlet && viewlet.label}
             <span class="lower">
               <Label label={viewlet.label} params={viewlet.labelParams ?? {}} />
@@ -306,7 +306,7 @@
       {/if}
 
       {#if viewlet && viewlet.display !== 'inline'}
-        <div class="activity-content content" class:contentHidden>
+        <div class="activity-content content" class:indent={isAttach} class:contentHidden>
           <ShowMore ignore={edit}>
             {#if tx.collectionAttribute !== undefined && (tx.txDocIds?.size ?? 0) > 1}
               <div class="flex-row-center flex-grow flex-wrap clear-mins">
@@ -321,7 +321,7 @@
         </div>
       {:else if hasMessageType && model.length > 0 && (tx.updateTx || tx.mixinTx)}
         {#await getValue(client, model[0], tx) then value}
-          <div class="activity-content content" class:contentHidden>
+          <div class="activity-content content" class:indent={isAttach} class:contentHidden>
             <ShowMore ignore={edit}>
               {#if value.isObjectSet}
                 <ObjectPresenter value={value.set} inline />
@@ -384,11 +384,6 @@
         flex-direction: column;
         padding-bottom: 0.25rem;
       }
-      &.comment {
-        .activity-content {
-          margin-top: 0.25rem;
-        }
-      }
       &:not(.comment) {
         .msgactivity-content__header {
           min-height: 1.75rem;
@@ -470,7 +465,6 @@
   .activity-content {
     overflow: hidden;
     visibility: visible;
-    margin-top: 0.125rem;
     max-height: max-content;
     opacity: 1;
     transition-property: max-height, opacity;
@@ -484,5 +478,8 @@
       max-height: 0;
       opacity: 0;
     }
+    &.indent {
+      margin-top: 0.5rem;
+    }
   }
 </style>