From 15c082e62fb74f1b232c7cc993981f7a3f2c4f38 Mon Sep 17 00:00:00 2001
From: Alexander Platov <sas_lord@mail.ru>
Date: Tue, 4 Apr 2023 05:47:32 +0300
Subject: [PATCH] TSK-1019, TSK-1026. Replacing colors (#2880)

Signed-off-by: Alexander Platov <sas_lord@mail.ru>
---
 .../src/components/CollaboratorEditor.svelte        | 11 +++++------
 .../src/components/ReferenceInput.svelte            |  4 ++--
 packages/theme/styles/_colors.scss                  |  2 +-
 packages/theme/styles/global.scss                   |  4 ++++
 packages/ui/src/components/Button.svelte            | 13 ++++++++++---
 .../components/issues/edit/CreateSubIssue.svelte    |  2 +-
 6 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/packages/text-editor/src/components/CollaboratorEditor.svelte b/packages/text-editor/src/components/CollaboratorEditor.svelte
index 8286110f8f..c7f791d1fd 100644
--- a/packages/text-editor/src/components/CollaboratorEditor.svelte
+++ b/packages/text-editor/src/components/CollaboratorEditor.svelte
@@ -471,7 +471,7 @@
 {#if visible}
   <div class="ref-container" class:autoOverflow>
     {#if isFormatting && !readonly}
-      <div class="formatPanelRef formatPanel flex-between clear-mins" class:focused>
+      <div class="formatPanelRef formatPanel flex-between clear-mins">
         <div class="flex-row-center buttons-group xsmall-gap">
           <StyleButton
             icon={Header}
@@ -743,10 +743,9 @@
     border-radius: 0.5rem;
     box-shadow: var(--button-shadow);
     z-index: 1;
-
-    &.focused {
-      position: sticky;
-      top: 1.25rem;
-    }
+  }
+  .ref-container:focus-within .formatPanel {
+    position: sticky;
+    top: 1.25rem;
   }
 </style>
diff --git a/packages/text-editor/src/components/ReferenceInput.svelte b/packages/text-editor/src/components/ReferenceInput.svelte
index ac12dd16ca..9224df0c5f 100644
--- a/packages/text-editor/src/components/ReferenceInput.svelte
+++ b/packages/text-editor/src/components/ReferenceInput.svelte
@@ -376,7 +376,7 @@
 
     .formatPanelRef {
       padding: 0.5rem;
-      background-color: var(--body-accent);
+      background-color: var(--body-color);
       border: 1px solid var(--divider-color);
       border-radius: 0.5rem 0.5rem 0 0;
       border-bottom: 0;
@@ -395,7 +395,7 @@
       align-items: flex-end;
       min-height: 2.75rem;
       padding: 0.75rem 1rem;
-      background-color: var(--accent-bg-color);
+      background-color: var(--body-accent);
       border: 1px solid var(--divider-color);
       border-radius: 0.5rem;
 
diff --git a/packages/theme/styles/_colors.scss b/packages/theme/styles/_colors.scss
index 866a61daf4..3421fc2346 100644
--- a/packages/theme/styles/_colors.scss
+++ b/packages/theme/styles/_colors.scss
@@ -135,7 +135,7 @@
 /* Light Theme */
 .theme-light {
   --body-color: #fff;
-  --body-accent: #eee; // HZ
+  --body-accent: #fafafa; // HZ
   --board-bg-color: #f4f5f8;
   --board-card-bg-color: #fff;
   --board-card-bg-hover: rgb(252, 252, 252);
diff --git a/packages/theme/styles/global.scss b/packages/theme/styles/global.scss
index 1c238733fc..3cceabd6c8 100644
--- a/packages/theme/styles/global.scss
+++ b/packages/theme/styles/global.scss
@@ -126,3 +126,7 @@ body {
   overflow: hidden;
   touch-action: none;
 }
+
+// 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); }
diff --git a/packages/ui/src/components/Button.svelte b/packages/ui/src/components/Button.svelte
index 0d0d67dc83..2523187ff6 100644
--- a/packages/ui/src/components/Button.svelte
+++ b/packages/ui/src/components/Button.svelte
@@ -303,9 +303,16 @@
         }
       }
     }
-    &.transparent:hover,
-    &.transparent.selected {
-      background-color: var(--button-bg-hover);
+    &.transparent {
+      &:hover {
+        background-color: var(--highlight-hover);
+      }
+      &.selected {
+        background-color: var(--highlight-select);
+      }
+      &.selected:hover {
+        background-color: var(--highlight-select-hover);
+      }
     }
     &.link {
       padding: 0 0.875rem;
diff --git a/plugins/tracker-resources/src/components/issues/edit/CreateSubIssue.svelte b/plugins/tracker-resources/src/components/issues/edit/CreateSubIssue.svelte
index a8b710d691..1d6cbc3720 100644
--- a/plugins/tracker-resources/src/components/issues/edit/CreateSubIssue.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/CreateSubIssue.svelte
@@ -285,7 +285,7 @@
 <style lang="scss">
   .root {
     padding: 0.75rem;
-    background-color: var(--accent-bg-color);
+    background-color: var(--body-accent);
     border: 1px solid var(--button-border-color);
     border-radius: 0.5rem;
     overflow: hidden;