From 4f62d9bef12f83015092522b6386ad9a076b0a8e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 9 Feb 2023 15:24:48 +0300 Subject: [PATCH 1/2] Fix svg icons for equation panel --- apps/common/main/resources/less/toolbar.less | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 88222120d0..0284f1a390 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -693,12 +693,23 @@ } .btn-toolbar { + &:hover:not(.disabled) { + svg.icon { + .btn& { + opacity: 1; + } + } + } + &:active, &.active { &:not(.disabled) { svg.icon { fill: @icon-normal-pressed-ie; fill: @icon-normal-pressed; + .btn& { + opacity: 1; + } } } } @@ -708,6 +719,9 @@ fill: @icon-normal-ie; fill: @icon-normal; + .btn& { + opacity: 1; + } } &.borders--small { From b51b0a07f19455c01ed564d2a267426c2fb92ae9 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 15 Feb 2023 21:35:13 +0300 Subject: [PATCH 2/2] Change icons for equation settings menu --- apps/documenteditor/main/app/view/DocumentHolder.js | 2 ++ apps/presentationeditor/main/app/view/DocumentHolder.js | 2 ++ apps/spreadsheeteditor/main/app/view/DocumentHolder.js | 1 + 3 files changed, 5 insertions(+) diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 842852ca46..72dea18950 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -1146,6 +1146,7 @@ define([ me.menuTableEquation = new Common.UI.MenuItem({ caption : me.advancedEquationText, + iconCls : 'menu__icon btn-equation', menu : me.createEquationMenu('popuptableeqinput', 'tl-tr') }); @@ -1599,6 +1600,7 @@ define([ me.menuParagraphEquation = new Common.UI.MenuItem({ caption : me.advancedEquationText, + iconCls : 'menu__icon btn-equation', menu : me.createEquationMenu('popupparaeqinput', 'tl-tr') }); /** coauthoring begin **/ diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index cf0c5ebe0d..49877c9819 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -1926,11 +1926,13 @@ define([ me.menuParagraphEquation = new Common.UI.MenuItem({ caption : me.advancedEquationText, + iconCls : 'menu__icon btn-equation', menu : me.createEquationMenu('popupparaeqinput', 'tl-tr') }); me.menuTableEquationSettings = new Common.UI.MenuItem({ caption : me.advancedEquationText, + iconCls : 'menu__icon btn-equation', menu : me.createEquationMenu('popuptableeqinput', 'tl-tr') }); diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index f5bd57defa..548c1b6be0 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -1076,6 +1076,7 @@ define([ me.menuParagraphEquation = new Common.UI.MenuItem({ caption : me.advancedEquationText, + iconCls : 'menu__icon btn-equation', menu : me.createEquationMenu('popupparaeqinput', 'tl-tr') });