From 6bdf8e90da1bb793263a6df6abb5eae18cbad160 Mon Sep 17 00:00:00 2001
From: Alexei Koshelev <aleksei.koshelev@onlyoffice.com>
Date: Wed, 27 Dec 2023 16:11:18 +0300
Subject: [PATCH] [SSE DE PE] Fix bug in shape shape menu for IE11

---
 apps/documenteditor/main/app/view/ShapeSettings.js         | 7 ++++++-
 apps/documenteditor/main/resources/less/rightmenu.less     | 3 ++-
 apps/presentationeditor/main/app/view/ShapeSettings.js     | 7 ++++++-
 apps/presentationeditor/main/resources/less/rightmenu.less | 3 ++-
 apps/spreadsheeteditor/main/app/view/ShapeSettings.js      | 7 ++++++-
 apps/spreadsheeteditor/main/resources/less/rightmenu.less  | 3 ++-
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js
index 5850d32e70..1b5f79c3c9 100644
--- a/apps/documenteditor/main/app/view/ShapeSettings.js
+++ b/apps/documenteditor/main/app/view/ShapeSettings.js
@@ -1958,7 +1958,12 @@ define([
                 ]),
                 itemTemplate: _.template(
                     '<div class="item-shadow">' +
-                        '<div style="margin-bottom:<%= offsetY %>px; margin-right:<%= offsetX %>px; box-shadow: <%= offsetX %>px <%= offsetY %>px 0px <%= spread %>px var(--text-tertiary);"></div>' +
+                        '<div ' +
+                            'style="margin-bottom:<%= offsetY %>px;' +
+                            'margin-right:<%= offsetX %>px;' +
+                            'box-shadow: <%= offsetX %>px <%= offsetY %>px 0px <%= spread %>px <% if(Common.Utils.isIE) {%>rgba(0,0,0,0.4)<%} else {%>var(--text-tertiary)<%}%>;"' +
+                        '>' +
+                        '</div>' + 
                     '</div>')
             });
             this.viewShadowShapePresets.on('item:click', _.bind(this.onSelectShadowPreset, this));
diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less
index 330cdccab7..8241fcafb8 100644
--- a/apps/documenteditor/main/resources/less/rightmenu.less
+++ b/apps/documenteditor/main/resources/less/rightmenu.less
@@ -271,7 +271,8 @@
         height: 32px;
         background: white;
         border-radius: 1px;
-        border: 1px var(--icon-normal) solid;
+        border: 1px @icon-normal-ie solid;
+        border: 1px @icon-normal solid;
     }
 }
 
diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js
index 46cd4aefce..9dd3a5ac47 100644
--- a/apps/presentationeditor/main/app/view/ShapeSettings.js
+++ b/apps/presentationeditor/main/app/view/ShapeSettings.js
@@ -1821,7 +1821,12 @@ define([
                 ]),
                 itemTemplate: _.template(
                     '<div class="item-shadow">' +
-                        '<div style="margin-bottom:<%= offsetY %>px; margin-right:<%= offsetX %>px; box-shadow: <%= offsetX %>px <%= offsetY %>px 0px <%= spread %>px var(--text-tertiary);"></div>' +
+                        '<div ' +
+                            'style="margin-bottom:<%= offsetY %>px;' +
+                            'margin-right:<%= offsetX %>px;' +
+                            'box-shadow: <%= offsetX %>px <%= offsetY %>px 0px <%= spread %>px <% if(Common.Utils.isIE) {%>rgba(0,0,0,0.4)<%} else {%>var(--text-tertiary)<%}%>;"' +
+                        '>' +
+                        '</div>' + 
                     '</div>')
             });
             this.viewShadowShapePresets.on('item:click', _.bind(this.onSelectShadowPreset, this));
diff --git a/apps/presentationeditor/main/resources/less/rightmenu.less b/apps/presentationeditor/main/resources/less/rightmenu.less
index 9f8b93bf89..f215e2b876 100644
--- a/apps/presentationeditor/main/resources/less/rightmenu.less
+++ b/apps/presentationeditor/main/resources/less/rightmenu.less
@@ -186,7 +186,8 @@
         height: 32px;
         background: white;
         border-radius: 1px;
-        border: 1px var(--icon-normal) solid;
+        border: 1px @icon-normal-ie solid;
+        border: 1px @icon-normal solid;
     }
 }
 
diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
index 68193bf7d1..16f81d8efa 100644
--- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
@@ -1836,7 +1836,12 @@ define([
                 ]),
                 itemTemplate: _.template(
                     '<div class="item-shadow">' +
-                        '<div style="margin-bottom:<%= offsetY %>px; margin-right:<%= offsetX %>px; box-shadow: <%= offsetX %>px <%= offsetY %>px 0px <%= spread %>px var(--text-tertiary);"></div>' +
+                        '<div ' +
+                            'style="margin-bottom:<%= offsetY %>px;' +
+                            'margin-right:<%= offsetX %>px;' +
+                            'box-shadow: <%= offsetX %>px <%= offsetY %>px 0px <%= spread %>px <% if(Common.Utils.isIE) {%>rgba(0,0,0,0.4)<%} else {%>var(--text-tertiary)<%}%>;"' +
+                        '>' +
+                        '</div>' + 
                     '</div>')
             });
             this.viewShadowShapePresets.on('item:click', _.bind(this.onSelectShadowPreset, this));
diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less
index 8b1157093d..fe33b68388 100644
--- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less
+++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less
@@ -184,7 +184,8 @@
         height: 32px;
         background: white;
         border-radius: 1px;
-        border: 1px var(--icon-normal) solid;
+        border: 1px @icon-normal-ie solid;
+        border: 1px @icon-normal solid;
     }
 }