Merge branch hotfix/v7.5.1 into master

xf360 · Nov 8, 2023 · 5238ddb · 5238ddb
2 parents dea6fbf + 06417b3
commit 5238ddb
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/apps/common/main/lib/controller/Desktop.js b/apps/common/main/lib/controller/Desktop.js
@@ -367,9 +367,9 @@ define([
                         }
                     });
                 }
-
-                _checkHelpAvailable.call(this);
             }
+
+            _checkHelpAvailable.call(this);
         }
 
         const _onHidePreloader = function (mode) {
@@ -615,6 +615,9 @@ define([
             isFeatureAvailable: function (feature) {
                 return !!native && !!native[feature];
             },
+            isWinXp: function () {
+                return nativevars && nativevars.os === 'winxp';
+            },
             call: function (name) {
                 if ( native[name] ) {
                     let args = [].slice.call(arguments, 1);
@@ -674,7 +677,7 @@ define([
 
                 return false;
             },
-    };
+        };
     };
 
     !Common.Controllers && (Common.Controllers = {});

diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less
@@ -210,7 +210,8 @@
     border-radius: 3px;
     overflow: hidden;
     box-shadow: 0 5px 15px -5px rgba(0, 0, 0, 0.2);
-    .ie & {
+    .ie &,
+    .winxp & {
         overflow: visible;
     }
 }

diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less
@@ -114,7 +114,8 @@
     border-radius: 3px;
     overflow: hidden;
     box-shadow: 0 5px 15px -5px rgba(0, 0, 0, 0.2);
-    .ie & {
+    .ie &,
+    .winxp & {
         overflow: visible;
     }
 }

diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js
@@ -476,19 +476,19 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
                         {
                             caption     : this.textInsideBorders,
                             iconCls     : 'menu__icon btn-border-inside',
-                            icls        : 'btn-border-center',
+                            icls        : 'btn-border-inside',
                             borderId    : 'inner'
                         },
                         {
                             caption     : this.textCenterBorders,
                             iconCls     : 'menu__icon btn-border-insidevert',
-                            icls        : 'btn-border-vmiddle',
+                            icls        : 'btn-border-insidevert',
                             borderId    : Asc.c_oAscBorderOptions.InnerV
                         },
                         {
                             caption     : this.textMiddleBorders,
                             iconCls     : 'menu__icon btn-border-insidehor',
-                            icls        : 'btn-border-hmiddle',
+                            icls        : 'btn-border-insidehor',
                             borderId    : Asc.c_oAscBorderOptions.InnerH
                         },
                         {

diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less
@@ -99,7 +99,8 @@
     &.has-open-menu {
         z-index: @zindex-navbar + 1;
     }
-    .ie & {
+    .ie &,
+    .winxp & {
         overflow: visible;
     }
 }