From 563291b19555c445fc357b65a03b363c360b6657 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Thu, 26 Aug 2021 17:33:13 +0300
Subject: [PATCH] Fix Bug 52205

---
 apps/documenteditor/main/app/view/Toolbar.js         |  2 +-
 .../main/app/view/WatermarkSettingsDialog.js         |  2 +-
 apps/documenteditor/main/resources/less/toolbar.less | 12 ------------
 apps/spreadsheeteditor/main/app/view/Toolbar.js      |  4 ++--
 .../main/resources/less/toolbar.less                 | 12 ------------
 5 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index d56509cd0..bce4c991f 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -265,7 +265,7 @@ define([
                                 {
                                     id: 'id-toolbar-menu-auto-fontcolor',
                                     caption: this.textAutoColor,
-                                    template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>')
+                                    template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon color-auto" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>')
                                 },
                                 {caption: '--'},
                                 {template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 169px; height: 216px; margin: 10px;"></div>')},
diff --git a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
index cda542b93..7b4f0336b 100644
--- a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
@@ -340,7 +340,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
                     {
                         id: 'watermark-auto-color',
                         caption: this.textAuto,
-                        template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>')
+                        template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon color-auto" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>')
                     },
                     {caption: '--'},
                         { template: _.template('<div id="watermark-menu-textcolor" style="width: 169px; height: 216px; margin: 10px;"></div>') },
diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less
index 2bcb39ba2..a8eef4f25 100644
--- a/apps/documenteditor/main/resources/less/toolbar.less
+++ b/apps/documenteditor/main/resources/less/toolbar.less
@@ -139,18 +139,6 @@
     text-overflow: ellipsis;
 }
 
-#id-toolbar-menu-auto-fontcolor > a.selected,
-#id-toolbar-menu-auto-fontcolor > a:hover,
-#watermark-auto-color > a.selected,
-#watermark-auto-color > a:hover {
-    span {
-        outline: @scaled-one-px-value-ie solid @icon-normal-ie;
-        outline: @scaled-one-px-value solid @icon-normal;
-        border: @scaled-one-px-value-ie solid @background-normal-ie;
-        border: @scaled-one-px-value solid @background-normal;
-    }
-}
-
 .save-style-container {
     cursor: default;
     position: relative;
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index 3d50e3c6d..cf2bb0d10 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -493,7 +493,7 @@ define([
                             {
                                 id: 'id-toolbar-menu-auto-fontcolor',
                                 caption: this.textAutoColor,
-                                template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>')
+                                template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon color-auto" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>')
                             },
                             {caption: '--'},
                             { template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 169px; height: 216px; margin: 10px;"></div>') },
@@ -1891,7 +1891,7 @@ define([
                                     {
                                         id: 'id-toolbar-menu-auto-bordercolor',
                                         caption: this.textAutoColor,
-                                        template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>'),
+                                        template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon color-auto" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>'),
                                         stopPropagation: true
                                     },
                                     {caption: '--'},
diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less
index 1b70b7237..2c9e35bf7 100644
--- a/apps/spreadsheeteditor/main/resources/less/toolbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less
@@ -103,18 +103,6 @@
     }
 }
 
-#id-toolbar-menu-auto-bordercolor > a.selected,
-#id-toolbar-menu-auto-bordercolor > a:hover,
-#id-toolbar-menu-auto-fontcolor > a.selected,
-#id-toolbar-menu-auto-fontcolor > a:hover {
-    span {
-        outline: @scaled-one-px-value-ie solid @border-regular-control-ie;
-        outline: @scaled-one-px-value solid @border-regular-control;
-        border: @scaled-one-px-value-ie solid @background-normal-ie;
-        border: @scaled-one-px-value solid @background-normal;
-    }
-}
-
 #special-paste-container,
 #autocorrect-paste-container {
     position: absolute;