diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index fb4e4ec74..53d25568b 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -79,11 +79,11 @@ } -.combo-styles { +.combo-styles(@combo-dataview-height: 46px, @item-height: 46px) { @combo-dataview-button-width: 30px; - @combo-dataview-height: 46px; - @combo-dataview-height-calc: calc(40px + 2 * @scaled-two-px-value + 2 * @scaled-one-px-value); - + @item-height-calc: calc(@item-height - 6px + 2 * @scaled-two-px-value + 2 * @scaled-one-px-value); + @combo-dataview-height-calc: calc(@combo-dataview-height - @scaled-one-px-value - 2 * (6px - 2 * @scaled-two-px-value - 2 * @scaled-one-px-value)); + height: @combo-dataview-height; height: @combo-dataview-height-calc; @@ -114,8 +114,8 @@ @minus-px: calc((-1px / @pixel-ratio-factor)); margin: 0 @minus-px-ie @minus-px-ie 0; margin: 0 @minus-px @minus-px 0; - height: @combo-dataview-height; - height: @combo-dataview-height-calc; + height: @item-height; + height: @item-height-calc; background-color: @background-normal-ie; background-color: @background-normal; display: flex; @@ -214,6 +214,14 @@ } } +.combo-styles { + .combo-styles() +} + +.combo-cell-styles { + .combo-styles(52px, 26px); +} + .combo-template(@combo-dataview-height: 64px) { @combo-dataview-button-width: 18px; diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 7febc545f..0a957de3c 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1280,10 +1280,10 @@ define([ }); me.listStyles = new Common.UI.ComboDataView({ - cls : 'combo-styles', + cls : 'combo-cell-styles', enableKeyEvents : true, - itemWidth : 112, - itemHeight : 40, + itemWidth : 100, + itemHeight : 20, style: 'min-width:158px;', groups: new Common.UI.DataViewGroupStore([ {id: 'menu-style-group-custom', caption: this.textCustom }, diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 2c867548a..ebce18d01 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -168,7 +168,7 @@ } } -.combo-styles { +.combo-cell-styles { .menu-picker-container .dataview { padding: 10px 15px 0 5px; }