pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-26 02:11:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2363 from ONLYOFFICE/fix/bugfix

Browse Source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova
2023-05-02 14:39:21 +03:00
committed by GitHub
parent a19a0c5a25 b95dc9b638
commit 22fd2dfecc
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/common/main/resources/less/combo-border-size.less
View File

@ -8,6 +8,9 @@
padding-top: 0;
padding-bottom: 0;
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}

4
apps/documenteditor/main/app/view/Toolbar.js
View File

@ -2101,7 +2101,7 @@ define([
cls: 'shifted-left',
style: 'min-width: 145px',
items: [
{template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 200px;"></div>')},
{template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 153px;"></div>')},
{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('<div id="<%= id %>" class="item-markerlist"></div>')