Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1114 from ONLYOFFICE/fix/bugfix

Browse source 
Fix Bug 51838
This commit is contained in:
Julia Radzhabova 2021-08-23 18:04:21 +03:00 committed by GitHub
parent bbdb119ddd e7cfb129c2
commit d611f07cdf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1700,9 +1700,9 @@ define([
this.btnMarkers.setMenu( this.btnMarkers.setMenu(
new Common.UI.Menu({ new Common.UI.Menu({
cls: 'shifted-left', cls: 'shifted-left',
style: 'min-width: 139px', style: 'min-width: 145px',
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 139px; margin: 0 9px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 145px; margin: 0 9px;"></div>')},
{caption: '--'}, {caption: '--'},
this.mnuMarkerChangeLevel = new Common.UI.MenuItem({ this.mnuMarkerChangeLevel = new Common.UI.MenuItem({
caption: this.textChangeLevel, caption: this.textChangeLevel,

4
apps/documenteditor/main/resources/less/toolbar.less
View file

@ -33,8 +33,8 @@
} }
.item-markerlist { .item-markerlist {
width: 38px; width: 40px;
height: 38px; height: 40px;
} }
.item-multilevellist { .item-multilevellist {

4
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -1218,9 +1218,9 @@ define([
this.btnMarkers.setMenu( this.btnMarkers.setMenu(
new Common.UI.Menu({ new Common.UI.Menu({
cls: 'shifted-left', cls: 'shifted-left',
style: 'min-width: 139px', style: 'min-width: 145px',
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 139px; margin: 0 9px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 145px; margin: 0 9px;"></div>')},
this.mnuMarkerSettings = new Common.UI.MenuItem({ this.mnuMarkerSettings = new Common.UI.MenuItem({
caption: this.textListSettings, caption: this.textListSettings,
value: 'settings' value: 'settings'

4
apps/presentationeditor/main/resources/less/toolbar.less
View file

@ -49,8 +49,8 @@
} }
.item-markerlist { .item-markerlist {
width: 38px; width: 40px;
height: 38px; height: 40px;
} }
.item-multilevellist { .item-multilevellist {

2
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
View file

@ -927,7 +927,7 @@ define([
cls: 'shifted-right', cls: 'shifted-right',
menuAlign: 'tl-tr', menuAlign: 'tl-tr',
items : [ items : [
{ template: _.template('<div id="id-docholder-menu-bullets" class="menu-layouts" style="width: 372px; margin: 4px 6px;"></div>') }, { template: _.template('<div id="id-docholder-menu-bullets" class="menu-layouts" style="width: 376px; margin: 4px 2px 4px 6px;"></div>') },
{caption: '--'}, {caption: '--'},
me.menuParagraphBulletNone = new Common.UI.MenuItem({ me.menuParagraphBulletNone = new Common.UI.MenuItem({
caption : me.textNone, caption : me.textNone,

12
apps/spreadsheeteditor/main/resources/less/toolbar.less
View file

@ -134,8 +134,8 @@
} }
.item-markerlist { .item-markerlist {
width: 38px; width: 40px;
height: 38px; height: 40px;
} }
.item-multilevellist { .item-multilevellist {
@ -145,7 +145,7 @@
#menu-list-number-group { #menu-list-number-group {
.item { .item {
margin-right: 9px; margin-right: 10px;
margin-bottom: 9px; margin-bottom: 9px;
} }
.group-items-container { .group-items-container {
@ -153,6 +153,12 @@
} }
} }
#menu-list-bullet-group {
.item {
margin-right: 2px;
}
}
#slot-field-zoom { #slot-field-zoom {
float: left; float: left;
min-width: 46px; min-width: 46px;