[DE][PE] Change icons for selecting bullets/numbering.

apps/documenteditor/main/app/view/Toolbar.js

@@ -1220,15 +1220,16 @@ define([
             this.btnNumbers.setMenu(
                 new Common.UI.Menu({
                     items: [
-                        { template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 330px; margin: 0 5px;"></div>') }
+                        { template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 185px; margin: 0 5px;"></div>') }
                     ]
                 })
             );
 
             this.btnMultilevels.setMenu(
                 new Common.UI.Menu({
+                    style: 'min-width: 90px',
                     items: [
-                        { template: _.template('<div id="id-toolbar-menu-multilevels" class="menu-markers" style="width: 165px; margin: 0 5px;"></div>') }
+                        { template: _.template('<div id="id-toolbar-menu-multilevels" class="menu-markers" style="width: 93px; margin: 0 5px;"></div>') }
                     ]
                 })
             );
@@ -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('<div id="<%= id %>" class="item-numberlist" style="background-position: 0 -<%= offsety %>px;"></div>')
+                itemTemplate: _.template('<div id="<%= id %>" class="item-markerlist" style="background-position: 0 -<%= offsety %>px;"></div>')
             });
             _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('<div id="<%= id %>" class="item-multilevellist" style="background-position: 0 -<%= offsety %>px;"></div>')
+                        {offsety: 304, data: {type: 2, subtype: 1}},
+                        {offsety: 342, data: {type: 2, subtype: 2}},
+                        {offsety: 380, data: {type: 2, subtype: 3}}
+                ]),
+                itemTemplate: _.template('<div id="<%= id %>" class="item-markerlist" style="background-position: 0 -<%= offsety %>px;"></div>')
             });
             _conf && this.mnuMultilevelPicker.selectByIndex(_conf.index, true);
 

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 {

apps/presentationeditor/main/app/view/Toolbar.js

@@ -1182,7 +1182,7 @@ define([
             this.btnNumbers.setMenu(
                 new Common.UI.Menu({
                     items: [
-                        { template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 330px; margin: 0 5px;"></div>') }
+                        { template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 185px; margin: 0 5px;"></div>') }
                     ]
                 })
             );
@@ -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('<div id="<%= id %>" class="item-numberlist" style="background-position: 0 -<%= offsety %>px;"></div>')
+                itemTemplate: _.template('<div id="<%= id %>" class="item-markerlist" style="background-position: 0 -<%= offsety %>px;"></div>')
             });
             _conf && this.mnuNumbersPicker.selectByIndex(_conf.index, true);
 

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 {