From 35e132ce68faacd3496c46c71568b482a55964f1 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Tue, 11 May 2021 15:00:34 +0300
Subject: [PATCH 1/2] [SSE] Fix Bug 50285

---
 apps/common/main/resources/less/buttons.less      | 15 +++++++++++----
 .../main/app/view/TableSettings.js                |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index 078f8ba5a..bed7c4f18 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -906,10 +906,6 @@
     &.template-table {
         width: 92px;
     }
-    &.sheet-template-table {
-        width: 83px;
-        height: 54px;
-    }
 
     .icon-template-slicer.icon {
         min-width: 36px;
@@ -930,6 +926,17 @@
         position: relative;
     }
 
+    &.sheet-template-table {
+        width: 83px;
+        height: 54px;
+
+        .icon {
+            border: none;
+            .box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie);
+            .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control);
+        }
+    }
+
     svg.icon {
         vertical-align: middle;
         width: 52px;
diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js
index 53f4e456f..1658816f0 100644
--- a/apps/spreadsheeteditor/main/app/view/TableSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js
@@ -452,7 +452,7 @@ define([
                     this.mnuTableTemplatePicker.selectRecord(rec, true);
                     this.btnTableTemplate.resumeEvents();
 
-                    this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '48px', 'width': '63px', 'background-position': 'center', 'background-size': 'auto 50px'});
+                    this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '46px', 'width': '61px', 'background-position': 'center', 'background-size': 'cover'});
 
                     this._state.TemplateName=value;
                 }

From be4a444adb12b320eb5a1b1ade06298f6f7501d5 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Tue, 11 May 2021 15:24:53 +0300
Subject: [PATCH 2/2] Fix Bug 50298

---
 apps/documenteditor/main/app/controller/Toolbar.js     | 2 +-
 apps/presentationeditor/main/app/controller/Toolbar.js | 2 +-
 apps/spreadsheeteditor/main/app/controller/Toolbar.js  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index 78ca39386..77a461263 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -1537,7 +1537,7 @@ define([
                 this.toolbar.fireEvent('insertimage', this.toolbar);
 
                 if (this.api)
-                    this.api.asc_addImage();
+                    setTimeout(function() {me.api.asc_addImage();}, 1);
 
                 Common.NotificationCenter.trigger('edit:complete', me.toolbar);
                 Common.component.Analytics.trackEvent('ToolBar', 'Image');
diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js
index 0b103cbf9..f28df0ff6 100644
--- a/apps/presentationeditor/main/app/controller/Toolbar.js
+++ b/apps/presentationeditor/main/app/controller/Toolbar.js
@@ -1556,7 +1556,7 @@ define([
             if (opts === 'file') {
                 me.toolbar.fireEvent('insertimage', this.toolbar);
 
-                me.api.asc_addImage();
+                setTimeout(function() {me.api.asc_addImage();}, 1);
 
                 Common.NotificationCenter.trigger('edit:complete', this.toolbar);
                 Common.component.Analytics.trackEvent('ToolBar', 'Image');
diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index 450de6271..3f66c3f29 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -858,7 +858,7 @@ define([
                 this.toolbar.fireEvent('insertimage', this.toolbar);
 
                 if (this.api)
-                    this.api.asc_addImage();
+                    setTimeout(function() {me.api.asc_addImage();}, 1);
 
                 Common.NotificationCenter.trigger('edit:complete', this.toolbar);
                 Common.component.Analytics.trackEvent('ToolBar', 'Image');