From fd72c1d2eb59ddaa3d2828f4ca1749be270027b0 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 10 Mar 2022 14:55:03 +0300 Subject: [PATCH] [PE] Fix merge release to develop --- .../main/app/template/Toolbar.template | 9 ++++++--- apps/presentationeditor/main/app/view/Animation.js | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template index 56f392f8b..f221d4c87 100644 --- a/apps/presentationeditor/main/app/template/Toolbar.template +++ b/apps/presentationeditor/main/app/template/Toolbar.template @@ -179,7 +179,7 @@
-
+
@@ -189,7 +189,7 @@
- + @@ -197,6 +197,9 @@
+ +
+
@@ -217,7 +220,7 @@
- +
diff --git a/apps/presentationeditor/main/app/view/Animation.js b/apps/presentationeditor/main/app/view/Animation.js index 04c1bb925..7eda3e166 100644 --- a/apps/presentationeditor/main/app/view/Animation.js +++ b/apps/presentationeditor/main/app/view/Animation.js @@ -196,7 +196,7 @@ define([ cls: 'combo-transitions combo-animation', itemWidth: itemWidth, itemHeight: itemHeight, - style: 'min-width:200px;', + style: 'min-width:210px;', itemTemplate: _.template([ '
', '
',