From 45b18d4f0fbe5310a2cf9b8172739b6baf80bf7b Mon Sep 17 00:00:00 2001
From: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com>
Date: Tue, 17 Nov 2020 18:56:16 +0300
Subject: [PATCH] [dark theme] changed @gray-soft and @gray-darker

---
 apps/common/main/resources/less/chat.less              |  2 +-
 apps/common/main/resources/less/checkbox.less          |  2 +-
 apps/common/main/resources/less/combo-dataview.less    |  2 +-
 apps/common/main/resources/less/combobox.less          |  6 +++---
 apps/common/main/resources/less/comments-panel.less    |  6 +++---
 apps/common/main/resources/less/comments.less          |  6 +++---
 apps/common/main/resources/less/header.less            |  2 +-
 apps/common/main/resources/less/input.less             |  4 ++--
 apps/common/main/resources/less/listview.less          |  2 +-
 apps/common/main/resources/less/masked-field.less      |  2 +-
 .../main/resources/less/multislider-gradient.less      |  6 +++---
 apps/common/main/resources/less/opendialog.less        |  4 ++--
 apps/common/main/resources/less/scroller.less          |  8 ++++----
 apps/common/main/resources/less/spinner.less           |  2 +-
 apps/common/main/resources/less/symboltable.less       | 10 +++++-----
 apps/common/main/resources/less/treeview.less          |  2 +-
 apps/common/main/resources/less/variables.less         |  4 ++--
 apps/common/main/resources/less/window.less            |  2 +-
 .../main/resources/less/celleditor.less                |  4 ++--
 .../main/resources/less/statusbar.less                 |  4 ++--
 20 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/apps/common/main/resources/less/chat.less b/apps/common/main/resources/less/chat.less
index f23d199f4..bbcb1e8f6 100644
--- a/apps/common/main/resources/less/chat.less
+++ b/apps/common/main/resources/less/chat.less
@@ -147,7 +147,7 @@
             font-size: 12px;
 
             &:focus {
-                border-color: @gray-darker;
+                border-color: @border-preview-select;
             }
         }
     }
diff --git a/apps/common/main/resources/less/checkbox.less b/apps/common/main/resources/less/checkbox.less
index 588f34fda..f5e9b218a 100644
--- a/apps/common/main/resources/less/checkbox.less
+++ b/apps/common/main/resources/less/checkbox.less
@@ -41,7 +41,7 @@
                     content: '';
                     position: absolute;
                     border: 1px solid @text-normal;
-                    background: @gray-soft;
+                    background: @icon-normal;
                     width: 8px;
                     height: 8px;
                     left: 2px;
diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less
index 0d72900aa..aee7993b0 100644
--- a/apps/common/main/resources/less/combo-dataview.less
+++ b/apps/common/main/resources/less/combo-dataview.less
@@ -94,7 +94,7 @@
         }
 
         &.selected {
-            .box-inner-shadow(0 0 0 2px @gray-darker);
+            .box-inner-shadow(0 0 0 2px @border-preview-select);
         }
     }
 
diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less
index cc3cb36b8..a50be5477 100644
--- a/apps/common/main/resources/less/combobox.less
+++ b/apps/common/main/resources/less/combobox.less
@@ -69,14 +69,14 @@
     &.input-group-nr.open:not(.no-highlighted) {
         & > .form-control,
         & > .btn {
-            border-color: @gray-darker;
+            border-color: @border-preview-select;
         }
     }
 
     &.input-group-nr:not(.no-highlighted) > .form-control {
         &:focus,
         &:focus ~ button.dropdown-toggle {
-            border-color: @gray-darker;
+            border-color: @border-preview-select;
         }
     }
 
@@ -136,7 +136,7 @@
     &.input-group-nr:not(.no-highlighted) {
         & > .form-control,
         & > .btn {
-            border-color: @gray-darker;
+            border-color: @border-preview-select;
         }
     }
 }
\ No newline at end of file
diff --git a/apps/common/main/resources/less/comments-panel.less b/apps/common/main/resources/less/comments-panel.less
index 2167858cc..096e6d65d 100644
--- a/apps/common/main/resources/less/comments-panel.less
+++ b/apps/common/main/resources/less/comments-panel.less
@@ -32,7 +32,7 @@
     }
 
     .user-date {
-        color: @gray-darker;
+        color: @border-preview-select;
         font-size: 10px;
         padding: 0 0 0 20px;
         height: 12px;
@@ -43,9 +43,9 @@
     }
 
     .user-quote {
-        color: @gray-darker;
+        color: @border-preview-select;
         font-style: italic;
-        border-left: 1px solid @gray-darker;
+        border-left: 1px solid @border-preview-select;
         margin-left: 20px;
         margin-top: 3px;
         padding: 5px 9px 5px 9px;
diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less
index 8c1949c2f..cb803d7d0 100644
--- a/apps/common/main/resources/less/comments.less
+++ b/apps/common/main/resources/less/comments.less
@@ -61,7 +61,7 @@
             border: 1px solid @border-toolbar;
             height: 100%;
             &:focus {
-                border-color: @gray-darker;
+                border-color: @border-preview-select;
             }
         }
     }
@@ -83,7 +83,7 @@
     line-height: normal;
     position: relative;
     overflow: hidden;
-    color: @gray-darker;
+    color: @border-preview-select;
 
     textarea {
         width: 100%;
@@ -95,7 +95,7 @@
         line-height: 15px;
         color: @text-normal;
         &:focus {
-            border-color: @gray-darker;
+            border-color: @border-preview-select;
         }
     }
 
diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less
index 8633aea4b..2cd2fcc6c 100644
--- a/apps/common/main/resources/less/header.less
+++ b/apps/common/main/resources/less/header.less
@@ -121,7 +121,7 @@
         white-space: nowrap;
         &.locked {
             text-decoration: none;
-            color: @gray-darker;
+            color: @border-preview-select;
             cursor: default;
         }
 
diff --git a/apps/common/main/resources/less/input.less b/apps/common/main/resources/less/input.less
index 9e2812493..e4766f6ca 100644
--- a/apps/common/main/resources/less/input.less
+++ b/apps/common/main/resources/less/input.less
@@ -49,7 +49,7 @@
 
     &.form-control:focus,
     .form-control:focus {
-        border-color: @gray-darker;
+        border-color: @border-preview-select;
     }
 
     &.error {
@@ -92,7 +92,7 @@ input[type="text"]::selection, textarea::selection {
 }
 
 textarea.form-control:focus {
-    border-color: @gray-darker;
+    border-color: @border-preview-select;
 }
 
 .input-field-btn {
diff --git a/apps/common/main/resources/less/listview.less b/apps/common/main/resources/less/listview.less
index 03251a941..7c4861267 100644
--- a/apps/common/main/resources/less/listview.less
+++ b/apps/common/main/resources/less/listview.less
@@ -22,7 +22,7 @@
   }
 
   &:not(.no-focus):focus {
-    border-color: @gray-darker;
+    border-color: @border-preview-select;
   }
 
   & > .item {
diff --git a/apps/common/main/resources/less/masked-field.less b/apps/common/main/resources/less/masked-field.less
index 35170677c..897f8f411 100644
--- a/apps/common/main/resources/less/masked-field.less
+++ b/apps/common/main/resources/less/masked-field.less
@@ -5,6 +5,6 @@
     padding: 0 3px;
 
     &:focus {
-        border-color: @gray-darker;
+        border-color: @border-preview-select;
     }
 }
\ No newline at end of file
diff --git a/apps/common/main/resources/less/multislider-gradient.less b/apps/common/main/resources/less/multislider-gradient.less
index 898e04ac7..77ced8657 100644
--- a/apps/common/main/resources/less/multislider-gradient.less
+++ b/apps/common/main/resources/less/multislider-gradient.less
@@ -18,8 +18,8 @@
             -webkit-transform: rotate(45deg);
             -o-transform: rotate(45deg);
             transform: rotate(45deg);
-            border-top: solid 1px @gray-darker;
-            border-left: solid 1px @gray-darker;
+            border-top: solid 1px @border-preview-select;
+            border-left: solid 1px @border-preview-select;
             border-radius: 0 3px;
             box-sizing: content-box;
             .thumb-top-inner {
@@ -36,7 +36,7 @@
             width: 10px;
             height: 9px;
             background-color: #ffffff;
-            border: solid 1px @gray-darker;
+            border: solid 1px @border-preview-select;
             border-top: none;
             border-radius: 2px;
             box-sizing: content-box;
diff --git a/apps/common/main/resources/less/opendialog.less b/apps/common/main/resources/less/opendialog.less
index 19e2a3d75..16547c6e7 100644
--- a/apps/common/main/resources/less/opendialog.less
+++ b/apps/common/main/resources/less/opendialog.less
@@ -43,7 +43,7 @@
         height: 110px !important;
         position:relative;
         overflow:hidden;
-        border: @gray-soft solid 1px;
+        border: @border-regular-control solid 1px;
       }
 
       #id-preview-data {
@@ -59,7 +59,7 @@
 
       td {
         padding: 1px 8px 1px 0;
-        border-right: @gray-soft solid 1px;
+        border-right: @border-regular-control solid 1px;
         min-width: 30px;
         height: 17px;
         white-space: nowrap;
diff --git a/apps/common/main/resources/less/scroller.less b/apps/common/main/resources/less/scroller.less
index 7b9b9b801..7e4a2e2d7 100644
--- a/apps/common/main/resources/less/scroller.less
+++ b/apps/common/main/resources/less/scroller.less
@@ -52,8 +52,8 @@
         &.in-scrolling {
             .ps-scrollbar-x {
                 &.always-visible-x {
-                    background-color: @gray-soft;
-                    border-color: @gray-soft;
+                    background-color: @border-regular-control;
+                    border-color: @border-regular-control;
                     background-position: center -7px;
                 }
             }
@@ -106,8 +106,8 @@
         &.in-scrolling {
             .ps-scrollbar-y {
                 &.always-visible-y {
-                    background-color: @gray-soft;
-                    border-color: @gray-soft;
+                    background-color: @border-regular-control;
+                    border-color: @border-regular-control;
                     background-position: -7px center;
                 }
             }
diff --git a/apps/common/main/resources/less/spinner.less b/apps/common/main/resources/less/spinner.less
index 790242436..1f6fb9078 100644
--- a/apps/common/main/resources/less/spinner.less
+++ b/apps/common/main/resources/less/spinner.less
@@ -10,7 +10,7 @@
         padding-right: @trigger-width + 2px;
 
         &:focus {
-            border-color: @gray-darker;
+            border-color: @border-preview-select;
         }
     }
 
diff --git a/apps/common/main/resources/less/symboltable.less b/apps/common/main/resources/less/symboltable.less
index 6b064a595..48afaa22c 100644
--- a/apps/common/main/resources/less/symboltable.less
+++ b/apps/common/main/resources/less/symboltable.less
@@ -7,8 +7,8 @@
   .cell{
     width: 31px;
     height: 33px;
-    border-right: 1px solid @gray-soft;
-    border-bottom: 1px solid @gray-soft;
+    border-right: 1px solid @border-regular-control;
+    border-bottom: 1px solid @border-regular-control;
     background: #ffffff;
     align-content: center;
     vertical-align: middle;
@@ -24,7 +24,7 @@
   }
 
   .cell-selected{
-    background-color: @gray-darker;
+    background-color: @border-preview-select;
     color: white;
   }
 }
@@ -33,7 +33,7 @@
   width: 100%;
   height: 32px;
   overflow: hidden;
-  border: @gray-soft solid 1px;
+  border: @border-regular-control solid 1px;
 }
 
 #symbol-table-scrollable-div {
@@ -42,7 +42,7 @@
     height: 132px;
     position:relative;
     overflow:hidden;
-    border: @gray-soft solid 1px;
+    border: @border-regular-control solid 1px;
   }
 
   #id-preview-data {
diff --git a/apps/common/main/resources/less/treeview.less b/apps/common/main/resources/less/treeview.less
index 967ff8cc1..d1630a6e6 100644
--- a/apps/common/main/resources/less/treeview.less
+++ b/apps/common/main/resources/less/treeview.less
@@ -20,7 +20,7 @@
   }
 
   &:focus {
-    border-color: @gray-darker;
+    border-color: @border-preview-select;
   }
 
   > .item {
diff --git a/apps/common/main/resources/less/variables.less b/apps/common/main/resources/less/variables.less
index 6135fada6..6c07976d0 100644
--- a/apps/common/main/resources/less/variables.less
+++ b/apps/common/main/resources/less/variables.less
@@ -14,12 +14,12 @@
 // -------------------------
 
 //@gray-deep:             #444444; //rgb(68, 68, 68)
-@gray-darker:           #848484; //rgb(132, 132, 132)
+//@gray-darker:           #848484; //rgb(132, 132, 132)
 //@gray-dark:             #cbcbcb; //rgb(203, 203, 203)
 //@gray:                  #cfcfcf; //rgb(207, 207, 207)
-@gray-soft:             #adadad; //rgb(173, 173, 173)
 //@gray-light:            #f1f1f1; //rgb(241, 241, 241)
 //@gray-lighter:          #ededed; //rgb(237, 237, 237)
+//@gray-soft:             #adadad; //rgb(173, 173, 173)
 
 @primary:               #7d858c; //rgb(125, 133, 140)
 @primary-hover:         #666d73; //rgb(102, 109, 115)
diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less
index b455acbc9..2c0a6f05b 100644
--- a/apps/common/main/resources/less/window.less
+++ b/apps/common/main/resources/less/window.less
@@ -46,7 +46,7 @@
         top: 0;
         text-overflow: ellipsis;
 
-        color: @gray-darker;
+        color: @border-preview-select;
         text-align: center;
         font-size: 12px;
         font-weight: 700;
diff --git a/apps/spreadsheeteditor/main/resources/less/celleditor.less b/apps/spreadsheeteditor/main/resources/less/celleditor.less
index 29ea98fc9..a8b39714e 100644
--- a/apps/spreadsheeteditor/main/resources/less/celleditor.less
+++ b/apps/spreadsheeteditor/main/resources/less/celleditor.less
@@ -22,7 +22,7 @@
             -webkit-transition: none;
 
             &[disabled] {
-                color: @gray-darker;
+                color: @border-preview-select;
                 opacity: 0.5;
             }
         }
@@ -87,7 +87,7 @@
             padding-bottom: 0;
 
             &[disabled] {
-                color: @gray-darker;
+                color: @border-preview-select;
                 opacity: 0.5;
             }
         }
diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less
index e31f755c0..cc4d6c946 100644
--- a/apps/spreadsheeteditor/main/resources/less/statusbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less
@@ -26,7 +26,7 @@
             text-align: center;
 
             &.disabled {
-                color: @gray-darker;
+                color: @border-preview-select;
                 cursor: default;
             }
         }
@@ -259,7 +259,7 @@
 
                 &:not(.active) {
                     > span {
-                        color: @gray-darker;
+                        color: @border-preview-select;
                     }
                 }