From f5e069b17334dac6dd59ed4c1056caf56a8a1dec Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 11 Dec 2024 16:50:27 +0300 Subject: [PATCH 1/2] [Forms] Fix ie styles --- apps/common/forms/resources/less/common.less | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less index 98139cd78b..f529826a41 100644 --- a/apps/common/forms/resources/less/common.less +++ b/apps/common/forms/resources/less/common.less @@ -59,10 +59,6 @@ @import "../../../../common/main/resources/less/advanced-settings-window.less"; @import "../../../../common/main/resources/less/searchdialog.less"; -@toolbarBorderColor: @border-toolbar-ie; -@toolbarBorderColor: @border-toolbar; -@toolbarTopColor: @background-toolbar-ie; -@toolbarTopColor: @background-toolbar; @toolbarFontSize: 12px; @iconSpriteCommonPath: "../../../../common/forms/resources/img/glyphicons.png"; @@ -112,7 +108,7 @@ min-width: 340px; z-index: 100; background-color: @background-toolbar-ie; - background-color: @toolbarTopColor; + background-color: @background-toolbar; display: flex; align-items: center; @@ -124,7 +120,8 @@ width: 100%; height: 40px; - .box-inner-shadow(0 -1px 0 @toolbarBorderColor); + .box-inner-shadow(0 -1px 0 @border-toolbar-ie); + .box-inner-shadow(0 -1px 0 @border-toolbar); } .group { From c1cad8d7a67ec54cd8d74b6adde732715601cf65 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 11 Dec 2024 16:52:09 +0300 Subject: [PATCH 2/2] Add file types for visio --- apps/api/documents/api.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 5f958e7ccd..aee333978b 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -480,7 +480,7 @@ if (typeof _config.document.fileType === 'string' && _config.document.fileType != '') { _config.document.fileType = _config.document.fileType.toLowerCase(); - var type = /^(?:(xls|xlsx|ods|csv|gsheet|xlsm|xlt|xltm|xltx|fods|ots|xlsb|sxc|et|ett|numbers)|(pps|ppsx|ppt|pptx|odp|gslides|pot|potm|potx|ppsm|pptm|fodp|otp|sxi|dps|dpt|key)|(pdf|djvu|xps|oxps)|(doc|docx|odt|gdoc|txt|rtf|mht|htm|html|mhtml|epub|docm|dot|dotm|dotx|fodt|ott|fb2|xml|oform|docxf|sxw|stw|wps|wpt|pages)|(vsdx))$/ + var type = /^(?:(xls|xlsx|ods|csv|gsheet|xlsm|xlt|xltm|xltx|fods|ots|xlsb|sxc|et|ett|numbers)|(pps|ppsx|ppt|pptx|odp|gslides|pot|potm|potx|ppsm|pptm|fodp|otp|sxi|dps|dpt|key)|(pdf|djvu|xps|oxps)|(doc|docx|odt|gdoc|txt|rtf|mht|htm|html|mhtml|epub|docm|dot|dotm|dotx|fodt|ott|fb2|xml|oform|docxf|sxw|stw|wps|wpt|pages)|(vsdx|vssx|vstx|vsdm|vssm|vstm))$/ .exec(_config.document.fileType); if (!type) { window.alert("The \"document.fileType\" parameter for the config object is invalid. Please correct it."); @@ -1033,7 +1033,7 @@ isForm = false; if (config.document) { if (typeof config.document.fileType === 'string') - type = /^(?:(pdf)|(djvu|xps|oxps)|(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots|xlsb|numbers)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp|key)|(oform|docxf)|(vsdx))$/ + type = /^(?:(pdf)|(djvu|xps|oxps)|(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots|xlsb|numbers)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp|key)|(oform|docxf)|(vsdx|vssx|vstx|vsdm|vssm|vstm))$/ .exec(config.document.fileType); if (config.document.permissions)