From 9cecb990eead7ac36d17910a4dc9b4088aabc3ca Mon Sep 17 00:00:00 2001
From: Alexander Platov <sas_lord@mail.ru>
Date: Sun, 15 May 2022 07:50:49 +0300
Subject: [PATCH] Fix Activity layout. (#1757)

Signed-off-by: Alexander Platov <sas_lord@mail.ru>
---
 packages/theme/styles/common.scss             |  2 +-
 .../src/components/Activity.svelte            |  8 +++---
 .../src/components/EditChannel.svelte         | 25 +++++++++++--------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/packages/theme/styles/common.scss b/packages/theme/styles/common.scss
index 05b7a484f6..15736a26b4 100644
--- a/packages/theme/styles/common.scss
+++ b/packages/theme/styles/common.scss
@@ -257,5 +257,5 @@
   margin: .25rem 0;
   min-height: 1px;
   height: 1px;
-  background-color: var(--highlight-select-border);
+  background-color: var(--divider-color);
 }
diff --git a/plugins/activity-resources/src/components/Activity.svelte b/plugins/activity-resources/src/components/Activity.svelte
index e1839f05e6..57daeb2de2 100644
--- a/plugins/activity-resources/src/components/Activity.svelte
+++ b/plugins/activity-resources/src/components/Activity.svelte
@@ -88,7 +88,7 @@
   </div>
 {:else}
   <slot />
-  <div class="antiDivider" style:margin={'1rem 0 .25rem'} />
+  <div class="antiDivider" style:margin={'1rem -1.5rem'} />
   <div class="header antiTitle">
     <div class="icon-wrapper">
       <div class="wrapped-icon icon flex-center"><IconActivity size={'small'} /></div>
@@ -117,14 +117,14 @@
     align-items: center;
     min-height: 2.5rem;
     height: 2.5rem;
-    background-color: var(--highlight-select);
-    border: 1px solid var(--highlight-select-border);
+    background-color: var(--accent-bg-color);
+    border: 1px solid var(--divider-color);
     border-radius: 0.125rem;
   }
   .icon {
     margin-left: 1rem;
     height: 2rem;
-    color: var(--primary-bg-color);
+    color: var(--caption-color);
   }
   .ref-input {
     flex-shrink: 0;
diff --git a/plugins/chunter-resources/src/components/EditChannel.svelte b/plugins/chunter-resources/src/components/EditChannel.svelte
index 71e7dbe82b..f61636d339 100644
--- a/plugins/chunter-resources/src/components/EditChannel.svelte
+++ b/plugins/chunter-resources/src/components/EditChannel.svelte
@@ -70,17 +70,22 @@
 >
   <svelte:fragment slot="title">
     {#if clazz && channel}
-      <div class="antiTitle icon-wrapper">
-        <div class="wrapped-icon">
-          {#if clazz.icon}<Icon icon={channel.private ? Lock : clazz.icon} size={'medium'} />{/if}
+      {#if _class === chunter.class.DirectMessage}
+        <span class="fs-title"><Label label={clazz.label} /></span>
+      {:else}
+        <div class="antiTitle icon-wrapper">
+          <div class="wrapped-icon">
+            {#if clazz.icon}<Icon icon={channel.private ? Lock : clazz.icon} size={'medium'} />{/if}
+          </div>
+          <div class="title-wrapper">
+            <span class="wrapped-title">
+              <span class="trans-title content-color"><Label label={clazz.label} />›</span>
+              {channel.name}
+            </span>
+            <span class="wrapped-subtitle">{channel.description}</span>
+          </div>
         </div>
-        <div class="title-wrapper">
-          <span class="wrapped-title"
-            ><span class="trans-title content-color"><Label label={clazz.label} />›</span> {channel.name}</span
-          >
-          <span class="wrapped-subtitle">{channel.description}</span>
-        </div>
-      </div>
+      {/if}
     {/if}
   </svelte:fragment>