diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index 9b9eba21d..04190efbf 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -157,9 +157,8 @@ } } -.combo-template { +.combo-template(@combo-dataview-height: 64px) { @combo-dataview-button-width: 18px; - @combo-dataview-height: 64px; height: @combo-dataview-height; @@ -196,6 +195,10 @@ } }; +.combo-template { + .combo-template(64px); +} + .combo-pattern { @combo-dataview-button-width: 15px; @combo-dataview-height: 40px; diff --git a/apps/spreadsheeteditor/main/app/template/TableSettings.template b/apps/spreadsheeteditor/main/app/template/TableSettings.template index 552f8b947..d7a550426 100644 --- a/apps/spreadsheeteditor/main/app/template/TableSettings.template +++ b/apps/spreadsheeteditor/main/app/template/TableSettings.template @@ -43,7 +43,7 @@ -
+
diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js index eb7c3d0c3..9b53830f5 100644 --- a/apps/spreadsheeteditor/main/app/view/TableSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js @@ -106,11 +106,10 @@ define([ this.chFilter.on('change', _.bind(this.onCheckFilterChange, this)); this.cmbTableTemplate = new Common.UI.ComboDataView({ - itemWidth: 70, - itemHeight: 50, + itemWidth: 61, + itemHeight: 46, menuMaxHeight: 300, - enableKeyEvents: true, - cls: 'combo-template' + enableKeyEvents: true }); this.cmbTableTemplate.render($('#table-combo-template')); this.cmbTableTemplate.openButton.menu.cmpEl.css({ diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less index cbf75424d..66cebf18b 100644 --- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less @@ -293,4 +293,8 @@ button:active .btn-change-shape {background-position: -56px -16px;} .pie-doughnut{ background-position: -200px 0; +} + +#table-combo-template .combo-dataview{ + .combo-template(60px); } \ No newline at end of file