From de98eaf0facd452714086d800b97efe7ff0f6b63 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Mon, 12 Jul 2021 18:08:02 +0300
Subject: [PATCH 1/3] [DE] Fix Bug 51224

---
 apps/documenteditor/main/app/view/FormSettings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js
index 1e7f0a893..72fdc4f9f 100644
--- a/apps/documenteditor/main/app/view/FormSettings.js
+++ b/apps/documenteditor/main/app/view/FormSettings.js
@@ -867,14 +867,14 @@ define([
                         this.chMulti.setValue(!!val, true);
                         this._state.Multi=val;
                     }
-                    this.chMulti.setDisabled(!this._state.Fixed);
+                    this.chMulti.setDisabled(!this._state.Fixed || this._state.Comb);
 
                     val = formTextPr.get_AutoFit();
                     if ( this._state.AutoFit!==val ) {
                         this.chAutofit.setValue(!!val, true);
                         this._state.AutoFit=val;
                     }
-                    this.chAutofit.setDisabled(!this._state.Fixed);
+                    this.chAutofit.setDisabled(!this._state.Fixed || this._state.Comb);
 
                     this.btnColor.setDisabled(!this._state.Comb);
 

From 172306dceb7bf8ddcaf433deeba06e9bd84ecdb4 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Mon, 12 Jul 2021 18:12:39 +0300
Subject: [PATCH 2/3] [SSE] Fix icon set combobox in dark style

---
 .../main/resources/less/combo-border-size.less     | 14 ++++++++++++++
 .../main/app/view/FormatRulesEditDlg.js            |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/apps/common/main/resources/less/combo-border-size.less b/apps/common/main/resources/less/combo-border-size.less
index f27acd1de..0d1422789 100644
--- a/apps/common/main/resources/less/combo-border-size.less
+++ b/apps/common/main/resources/less/combo-border-size.less
@@ -57,4 +57,18 @@
     .form-control:not(input) {
         cursor: pointer;
     }
+
+    li {
+        img {
+            -webkit-filter: none;
+            filter: none;
+        }
+
+        &.selected {
+            img {
+                -webkit-filter: none;
+                filter: none;
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js
index 21f537a89..a5bc7b4b9 100644
--- a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js
@@ -229,7 +229,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
                 editable    : false,
                 cls         : 'input-group-nr',
                 data        : cmbData,
-                takeFocusOnClose: true
+                takeFocusOnClose: true,
+                scrollAlwaysVisible: false
             }).on('selected', function(combo, record) {
                 me.refreshRules(record.value);
             });

From c20d006606f3f1ce66aa6a9f050a9a2024164eb6 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Mon, 12 Jul 2021 18:20:49 +0300
Subject: [PATCH 3/3] [SSE] Fix Bug 51240

---
 .../main/app/template/FormatRulesEditDlg.template               | 2 +-
 apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/template/FormatRulesEditDlg.template b/apps/spreadsheeteditor/main/app/template/FormatRulesEditDlg.template
index cb6411f36..5b818504b 100644
--- a/apps/spreadsheeteditor/main/app/template/FormatRulesEditDlg.template
+++ b/apps/spreadsheeteditor/main/app/template/FormatRulesEditDlg.template
@@ -42,7 +42,7 @@
             <td class="padding-small">
                 <label class="header"><%= scope.textPreview %></label>
                 <div style="border: 1px solid #cbcbcb;width: 150px; height: 40px; padding: 3px;">
-                    <div id="format-rules-edit-preview-format" style="width: 100%; height: 100%; position: relative; margin: 0 auto;"></div>
+                    <div id="format-rules-edit-preview-format" style="width: 100%; height: 100%; position: relative; margin: 0 auto;background-color: #ffffff;"></div>
                     </div>
                 </td>
             </tr>
diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js
index 2eeabea6e..821b0f3fc 100644
--- a/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js
@@ -152,7 +152,7 @@ define([  'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
                     '<div class="list-item" style="width: 100%;display:inline-block;" id="format-manager-item-<%= ruleIndex %>">',
                         '<div style="width:181px;padding-right: 10px;display: inline-block;vertical-align: middle;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;"><%= name %></div>',
                         '<div style="width:181px;padding-right: 10px;display: inline-block;vertical-align: middle;"><div id="format-manager-txt-rule-<%= ruleIndex %>" style=""></div></div>',
-                        '<div style="width:112px;display: inline-block;vertical-align: middle;"><div id="format-manager-item-preview-<%= ruleIndex %>" style="height:22px;"></div></div>',
+                        '<div style="width:112px;display: inline-block;vertical-align: middle;"><div id="format-manager-item-preview-<%= ruleIndex %>" style="height:22px;background-color: #ffffff;"></div></div>',
                         '<% if (lock) { %>',
                             '<div class="lock-user"><%=lockuser%></div>',
                         '<% } %>',