From ea00d2d8694e7c958ecf3933c650f92f3789226e Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sun, 7 Aug 2022 10:37:06 +0300
Subject: [PATCH] theme fixes

---
 frontend/less/espo/custom.less          |  2 ++
 frontend/less/espo/elements/modal.less  | 36 ++++++++++++++++++++-----
 frontend/less/espo/value-variables.less |  2 +-
 frontend/less/sakura/variables.less     |  1 +
 frontend/less/violet/variables.less     |  1 +
 5 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index 1d70c9c35a..88782e02e1 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -3251,6 +3251,8 @@ a.close:hover {
         z-index: 1009;
         height: 26px;
         padding: 4px 8px;
+        border-top-left-radius: var(--border-radius);
+        border-top-right-radius: var(--border-radius);
 
         background-color: var(--collapsed-modal-bg);
 
diff --git a/frontend/less/espo/elements/modal.less b/frontend/less/espo/elements/modal.less
index 2eeae17340..55c1f3d3b4 100644
--- a/frontend/less/espo/elements/modal.less
+++ b/frontend/less/espo/elements/modal.less
@@ -56,22 +56,44 @@
         height: @font-size-h3;
         display: inline-block;
     }
-    opacity: 0.4;
+    opacity: 1;
+    text-shadow: none;
+
+    &,
+    > .fas,
+    > .far {
+        color: var(--text-muted-color);
+    }
+
+    &:hover {
+        opacity: 1;
+        &,
+        > .fas,
+        > .far {
+            color: var(--btn-text-color);
+        }
+    }
 }
 
 .modal-header .collapse-button {
-    opacity: 0.4;
     float: right;
     padding-right: 17px;
     padding-left: 17px;
     top: 3px;
     position: relative;
-    color: var(--gray-soft);
 
-    &:hover,
-    &:focus {
-        color: var(--gray-soft);
-        opacity: 0.8;
+    &,
+    > .fas,
+    > .far {
+        color: var(--text-muted-color);
+    }
+
+    &:hover {
+        &,
+        > .fas,
+        > .far {
+            color: var(--btn-text-color);
+        }
     }
 }
 
diff --git a/frontend/less/espo/value-variables.less b/frontend/less/espo/value-variables.less
index 9b354bda28..adc22d2c72 100644
--- a/frontend/less/espo/value-variables.less
+++ b/frontend/less/espo/value-variables.less
@@ -3,12 +3,12 @@
 @white-color-value: #FEFEFE;
 
 @gray-base-value: #000;
-@gray-soft-value: lighten(@gray-base-value, 39.0%);
 @gray-dark-value: lighten(@gray-base-value, 20%);
 @gray-value: lighten(@gray-base, 33.5%);
 @gray-light-value: lighten(@gray-base, 46.7%);
 @gray-lighter-value: lighten(@gray-base-value, 93.5%);
 
+@gray-soft-value: #7c7c7c;
 @gray-light-value: #999;
 
 @body-bg-value: #f1f1f1;
diff --git a/frontend/less/sakura/variables.less b/frontend/less/sakura/variables.less
index ff9b7de185..69e9f37d74 100644
--- a/frontend/less/sakura/variables.less
+++ b/frontend/less/sakura/variables.less
@@ -11,6 +11,7 @@
 @default-heading-bg-color-value: #f1f1f1;
 
 @main-gray-value: #ececec;
+@gray-soft-value: #8a8a8a;
 
 @brand-primary-value: #6490b7;
 @brand-success-value: #83CD77;
diff --git a/frontend/less/violet/variables.less b/frontend/less/violet/variables.less
index 772857f1f2..eed3bd3a4f 100644
--- a/frontend/less/violet/variables.less
+++ b/frontend/less/violet/variables.less
@@ -8,6 +8,7 @@
 @link-color-value: #6e86ca;
 
 @main-gray-value: #E4E7F2;
+@gray-soft-value: #8a8a8a;
 
 @modal-header-bg-value: @body-bg-value;