diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index fa20b37f2..15ace2bb8 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1220,15 +1220,16 @@ define([ this.btnNumbers.setMenu( new Common.UI.Menu({ items: [ - { template: _.template('
') } + { template: _.template('') } ] }) ); this.btnMultilevels.setMenu( new Common.UI.Menu({ + style: 'min-width: 90px', items: [ - { template: _.template('') } + { template: _.template('') } ] }) ); @@ -1353,19 +1354,19 @@ define([ this.mnuNumbersPicker = new Common.UI.DataView({ el: $('#id-toolbar-menu-numbering'), parentMenu: this.btnNumbers.menu, - restoreHeight: 164, + restoreHeight: 92, allowScrollbar: false, store: new Common.UI.DataViewStore([ {offsety: 0, data: {type: 1, subtype: -1}}, - {offsety: 518, data: {type: 1, subtype: 4}}, - {offsety: 592, data: {type: 1, subtype: 5}}, - {offsety: 666, data: {type: 1, subtype: 6}}, - {offsety: 296, data: {type: 1, subtype: 1}}, - {offsety: 370, data: {type: 1, subtype: 2}}, - {offsety: 444, data: {type: 1, subtype: 3}}, - {offsety: 740, data: {type: 1, subtype: 7}} + {offsety: 570, data: {type: 1, subtype: 4}}, + {offsety: 532, data: {type: 1, subtype: 5}}, + {offsety: 608, data: {type: 1, subtype: 6}}, + {offsety: 418, data: {type: 1, subtype: 1}}, + {offsety: 456, data: {type: 1, subtype: 2}}, + {offsety: 494, data: {type: 1, subtype: 3}}, + {offsety: 646, data: {type: 1, subtype: 7}} ]), - itemTemplate: _.template('') + itemTemplate: _.template('') }); _conf && this.mnuNumbersPicker.selectByIndex(_conf.index, true); @@ -1373,15 +1374,15 @@ define([ this.mnuMultilevelPicker = new Common.UI.DataView({ el: $('#id-toolbar-menu-multilevels'), parentMenu: this.btnMultilevels.menu, - restoreHeight: 164, + restoreHeight: 92, allowScrollbar: false, store: new Common.UI.DataViewStore([ { offsety:0, data:{type:2, subtype:-1} }, - { offsety:74, data:{type:2, subtype:1} }, - { offsety:148, data:{type:2, subtype:2} }, - { offsety:222, data:{type:2, subtype:3} } - ]), - itemTemplate: _.template('') + {offsety: 304, data: {type: 2, subtype: 1}}, + {offsety: 342, data: {type: 2, subtype: 2}}, + {offsety: 380, data: {type: 2, subtype: 3}} + ]), + itemTemplate: _.template('') }); _conf && this.mnuMultilevelPicker.selectByIndex(_conf.index, true); diff --git a/apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering.png b/apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering.png new file mode 100644 index 000000000..7831c5018 Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering@2x.png b/apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering@2x.png new file mode 100644 index 000000000..2839461c1 Binary files /dev/null and b/apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering@2x.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/bullets.png b/apps/documenteditor/main/resources/img/toolbar/bullets.png deleted file mode 100644 index afafb2327..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/bullets.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/bullets@2x.png b/apps/documenteditor/main/resources/img/toolbar/bullets@2x.png deleted file mode 100644 index 328cd3fb8..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/bullets@2x.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/multilevels-numbering.png b/apps/documenteditor/main/resources/img/toolbar/multilevels-numbering.png deleted file mode 100644 index 4c4251d92..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/multilevels-numbering.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/multilevels-numbering@2x.png b/apps/documenteditor/main/resources/img/toolbar/multilevels-numbering@2x.png deleted file mode 100644 index 8208d6e59..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/multilevels-numbering@2x.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index 98097e47a..75d9b3a18 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -84,19 +84,11 @@ } .item-markerlist { - .background-ximage('@{app-image-path}/toolbar/bullets.png', '@{app-image-path}/toolbar/bullets@2x.png', 38px); + .background-ximage('@{app-image-path}/toolbar/bullets-and-numbering.png', '@{app-image-path}/toolbar/bullets-and-numbering@2x.png', 38px); width: 38px; height: 38px; } -.item-numberlist, -.item-multilevellist { - .background-ximage('@{app-image-path}/toolbar/multilevels-numbering.png', '@{app-image-path}/toolbar/multilevels-numbering@2x.png', 74px); - width: 74px; - height: 74px; -} - - .color-schemas-menu { span { &.colors { diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 56a3cb5dd..2e1980430 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1182,7 +1182,7 @@ define([ this.btnNumbers.setMenu( new Common.UI.Menu({ items: [ - { template: _.template('') } + { template: _.template('') } ] }) ); @@ -1229,19 +1229,19 @@ define([ this.mnuNumbersPicker = new Common.UI.DataView({ el: $('#id-toolbar-menu-numbering'), parentMenu: this.btnNumbers.menu, - restoreHeight: 164, + restoreHeight: 92, allowScrollbar: false, store: new Common.UI.DataViewStore([ { offsety: 0, data:{type:1,subtype:-1} }, - { offsety: 296, data:{type:1,subtype:4} }, - { offsety: 370, data:{type:1,subtype:5} }, - { offsety: 444, data:{type:1,subtype:6} }, - { offsety: 74, data:{type:1,subtype:1} }, - { offsety: 148, data:{type:1,subtype:2} }, - { offsety: 222, data:{type:1,subtype:3} }, - { offsety: 518, data:{type:1,subtype:7} } + {offsety: 570, data: {type: 1, subtype: 4}}, + {offsety: 532, data: {type: 1, subtype: 5}}, + {offsety: 608, data: {type: 1, subtype: 6}}, + {offsety: 418, data: {type: 1, subtype: 1}}, + {offsety: 456, data: {type: 1, subtype: 2}}, + {offsety: 494, data: {type: 1, subtype: 3}}, + {offsety: 646, data: {type: 1, subtype: 7}} ]), - itemTemplate: _.template('') + itemTemplate: _.template('') }); _conf && this.mnuNumbersPicker.selectByIndex(_conf.index, true); diff --git a/apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering.png b/apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering.png new file mode 100644 index 000000000..7831c5018 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering@2x.png b/apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering@2x.png new file mode 100644 index 000000000..2839461c1 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering@2x.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/bullets.png b/apps/presentationeditor/main/resources/img/toolbar/bullets.png deleted file mode 100644 index afafb2327..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/bullets.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/bullets@2x.png b/apps/presentationeditor/main/resources/img/toolbar/bullets@2x.png deleted file mode 100644 index 328cd3fb8..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/bullets@2x.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/numbering.png b/apps/presentationeditor/main/resources/img/toolbar/numbering.png deleted file mode 100644 index 2e481e695..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/numbering.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/numbering@2x.png b/apps/presentationeditor/main/resources/img/toolbar/numbering@2x.png deleted file mode 100644 index 5e2196106..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/numbering@2x.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index ac9652adb..87c51fa4f 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -121,18 +121,11 @@ } .item-markerlist { - .background-ximage('@{app-image-path}/toolbar/bullets.png', '@{app-image-path}/toolbar/bullets@2x.png', 38px); + .background-ximage('@{app-image-path}/toolbar/bullets-and-numbering.png', '@{app-image-path}/toolbar/bullets-and-numbering@2x.png', 38px); width: 38px; height: 38px; } -.item-numberlist { - .background-ximage('@{app-image-path}/toolbar/numbering.png', '@{app-image-path}/toolbar/numbering@2x.png', 74px); - width: 74px; - height: 74px; -} - - .color-schemas-menu { span { &.colors {