From b151f9408e90cf6c3c95b29afc53169532748527 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 2 May 2023 14:29:16 +0300 Subject: [PATCH 1/2] Fix Bug 62374 --- apps/common/main/resources/less/combo-border-size.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/common/main/resources/less/combo-border-size.less b/apps/common/main/resources/less/combo-border-size.less index d2fbeaae2a..3adceb8723 100644 --- a/apps/common/main/resources/less/combo-border-size.less +++ b/apps/common/main/resources/less/combo-border-size.less @@ -8,6 +8,9 @@ padding-top: 0; padding-bottom: 0; display: block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } } From b95dc9b638958ccb72342b776d3b948c8070ee39 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 2 May 2023 14:30:35 +0300 Subject: [PATCH 2/2] [DE] Fix bullets list --- apps/documenteditor/main/app/view/Toolbar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index caf9b398fb..847d5177a4 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -2101,7 +2101,7 @@ define([ cls: 'shifted-left', style: 'min-width: 145px', items: [ - {template: _.template('')}, + {template: _.template('')}, {caption: '--'}, this.mnuMarkerChangeLevel = new Common.UI.MenuItem({ cls: 'list-level', @@ -2389,7 +2389,7 @@ define([ {id: 'id-markers-' + Common.UI.getId(), numberingInfo: me._markersArr[4], skipRenderOnChange: true, tip: this.tipMarkersStar, group : libGroup, type: 1}, {id: 'id-markers-' + Common.UI.getId(), numberingInfo: me._markersArr[5], skipRenderOnChange: true, tip: this.tipMarkersArrow, group : libGroup, type: 1}, {id: 'id-markers-' + Common.UI.getId(), numberingInfo: me._markersArr[6], skipRenderOnChange: true, tip: this.tipMarkersCheckmark, group : libGroup, type: 1}, - // {id: 'id-markers-' + Common.UI.getId(), numberingInfo: me._markersArr[7], skipRenderOnChange: true, tip: this.tipMarkersFRhombus, group : libGroup, type: 1}, + {id: 'id-markers-' + Common.UI.getId(), numberingInfo: me._markersArr[7], skipRenderOnChange: true, tip: this.tipMarkersFRhombus, group : libGroup, type: 1}, {id: 'id-markers-' + Common.UI.getId(), numberingInfo: me._markersArr[8], skipRenderOnChange: true, tip: this.tipMarkersDash, group : libGroup, type: 1} ])), itemTemplate: _.template('
')