Merge pull request #975 from ONLYOFFICE/fix/bugfix

Fix/bugfix

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;
+            }
+        }
+    }
 }

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);
 

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>

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);
             });

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>',
                         '<% } %>',