From bfb2625fff6f9a338e8a157492df3a95b8ef1334 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Mon, 15 Jul 2019 16:27:39 +0300
Subject: [PATCH] [PE] Change button styles

---
 .../main/resources/less/leftmenu.less         | 31 +++++++------------
 .../main/resources/less/rightmenu.less        | 18 ++++++-----
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less
index 8b3682eaa..9f099db75 100644
--- a/apps/presentationeditor/main/resources/less/leftmenu.less
+++ b/apps/presentationeditor/main/resources/less/leftmenu.less
@@ -7,29 +7,22 @@
 
         .tool-menu-btns {
             border-right: 1px solid @gray-dark;
-
-            .toolbar-btn-icon(btn-menu-file,        49, @toolbar-icon-size);
-            .toolbar-btn-icon(btn-menu-search,      50, @toolbar-icon-size);
-            .toolbar-btn-icon(btn-menu-thumbs,      51, @toolbar-icon-size);
-            .toolbar-btn-icon(btn-menu-comments,    52, @toolbar-icon-size);
-            .toolbar-btn-icon(btn-menu-chat,        53, @toolbar-icon-size);
-            .toolbar-btn-icon(btn-menu-about,       55, @toolbar-icon-size);
-            .toolbar-btn-icon(btn-menu-support,     68, @toolbar-icon-size);
-            .toolbar-btn-icon(btn-menu-plugin,      73, @toolbar-icon-size);
-
-            button.notify .btn-menu-chat,
-            button.notify.over > .btn-menu-chat {background-position: -0*@toolbar-icon-size -54*@toolbar-icon-size;}
-            button.notify:active   > .btn-menu-chat {background-position: -1*@toolbar-icon-size -54*@toolbar-icon-size;}
-            button.notify.disabled > .btn-menu-chat {background-position: -2*@toolbar-icon-size -54*@toolbar-icon-size;}
-
-            button.notify .btn-menu-comments,
-            button.notify.over > .btn-menu-comments {background-position: -0*@toolbar-icon-size -70*@toolbar-icon-size;}
-            button.notify:active   > .btn-menu-comments {background-position: -1*@toolbar-icon-size -70*@toolbar-icon-size;}
-            button.notify.disabled > .btn-menu-comments {background-position: -2*@toolbar-icon-size -70*@toolbar-icon-size;}
         }
     }
 }
 
+button.notify .btn-menu-chat {background-position: -0*@toolbar-icon-size -54*@toolbar-icon-size;}
+button.notify .btn-menu-comments {background-position: -0*@toolbar-icon-size -70*@toolbar-icon-size;}
+
+.button-normal-icon(btn-menu-file,        49, @toolbar-icon-size);
+.button-normal-icon(btn-menu-search,      50, @toolbar-icon-size);
+.button-normal-icon(btn-menu-thumbs,      51, @toolbar-icon-size);
+.button-normal-icon(btn-menu-comments,    52, @toolbar-icon-size);
+.button-normal-icon(btn-menu-chat,        53, @toolbar-icon-size);
+.button-normal-icon(btn-menu-about,       55, @toolbar-icon-size);
+.button-normal-icon(btn-menu-support,     68, @toolbar-icon-size);
+.button-normal-icon(btn-menu-plugin,      73, @toolbar-icon-size);
+
 #left-menu {
     &+.layout-resizer {
         border-left: 0 none;
diff --git a/apps/presentationeditor/main/resources/less/rightmenu.less b/apps/presentationeditor/main/resources/less/rightmenu.less
index fed728d9b..f9ca627a5 100644
--- a/apps/presentationeditor/main/resources/less/rightmenu.less
+++ b/apps/presentationeditor/main/resources/less/rightmenu.less
@@ -7,28 +7,28 @@
         right: 0;
 
         /*menuText*/
-        .toolbar-btn-icon(btn-menu-text,    40, @toolbar-icon-size);
+        .button-normal-icon(btn-menu-text,    40, @toolbar-icon-size);
 
         /*menuImage*/
-        .toolbar-btn-icon(btn-menu-image,   43, @toolbar-icon-size);
+        .button-normal-icon(btn-menu-image,   43, @toolbar-icon-size);
 
         /*menuTable*/
-        .toolbar-btn-icon(btn-menu-table,   42, @toolbar-icon-size);
+        .button-normal-icon(btn-menu-table,   42, @toolbar-icon-size);
 
         /*menuChart*/
-        .toolbar-btn-icon(btn-menu-chart,   44, @toolbar-icon-size);
+        .button-normal-icon(btn-menu-chart,   44, @toolbar-icon-size);
 
         /*menuSlide*/
-        .toolbar-btn-icon(btn-menu-slide,   56, @toolbar-icon-size);
+        .button-normal-icon(btn-menu-slide,   56, @toolbar-icon-size);
 
         /*menuShape*/
-        .toolbar-btn-icon(btn-menu-shape,   39, @toolbar-icon-size);
+        .button-normal-icon(btn-menu-shape,   39, @toolbar-icon-size);
 
         /*menuTextArt*/
-        .toolbar-btn-icon(btn-menu-textart, 57, @toolbar-icon-size);
+        .button-normal-icon(btn-menu-textart, 57, @toolbar-icon-size);
 
         /**menuSignature*/
-        .toolbar-btn-icon(btn-menu-signature, 77, @toolbar-icon-size);
+        .button-normal-icon(btn-menu-signature, 77, @toolbar-icon-size);
     }
 }
 
@@ -123,6 +123,8 @@
 .button-normal-icon(btn-position-inner-vert,  8, 21px);
 .button-normal-icon(btn-position-right,       9, 21px);
 
+.button-otherstates-icon2(btn-category, @toolbar-icon-size);
+
 .button-otherstates-icon(btn-borders-small, 21px);
 
 .btn-edit-table,