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

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

Browse source
This commit is contained in:
Julia Radzhabova 2017-05-16 13:06:23 +03:00
parent f10c01cfd2
commit 22e130d9db
16 changed files with 29 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1603,15 +1603,16 @@ define([
this.btnNumbers.setMenu( this.btnNumbers.setMenu(
new Common.UI.Menu({ new Common.UI.Menu({
items: [ 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( this.btnMultilevels.setMenu(
new Common.UI.Menu({ new Common.UI.Menu({
style: 'min-width: 90px',
items: [ 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>')}
] ]
}) })
); );
@ -1716,19 +1717,19 @@ define([
this.mnuNumbersPicker = new Common.UI.DataView({ this.mnuNumbersPicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-numbering'), el: $('#id-toolbar-menu-numbering'),
parentMenu: this.btnNumbers.menu, parentMenu: this.btnNumbers.menu,
restoreHeight: 164, restoreHeight: 92,
allowScrollbar: false, allowScrollbar: false,
store: new Common.UI.DataViewStore([ store: new Common.UI.DataViewStore([
{offsety: 0, data: {type: 1, subtype: -1}}, {offsety: 0, data: {type: 1, subtype: -1}},
{offsety: 518, data: {type: 1, subtype: 4}}, {offsety: 570, data: {type: 1, subtype: 4}},
{offsety: 592, data: {type: 1, subtype: 5}}, {offsety: 532, data: {type: 1, subtype: 5}},
{offsety: 666, data: {type: 1, subtype: 6}}, {offsety: 608, data: {type: 1, subtype: 6}},
{offsety: 296, data: {type: 1, subtype: 1}}, {offsety: 418, data: {type: 1, subtype: 1}},
{offsety: 370, data: {type: 1, subtype: 2}}, {offsety: 456, data: {type: 1, subtype: 2}},
{offsety: 444, data: {type: 1, subtype: 3}}, {offsety: 494, data: {type: 1, subtype: 3}},
{offsety: 740, data: {type: 1, subtype: 7}} {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); _conf && this.mnuNumbersPicker.selectByIndex(_conf.index, true);
@ -1736,15 +1737,15 @@ define([
this.mnuMultilevelPicker = new Common.UI.DataView({ this.mnuMultilevelPicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-multilevels'), el: $('#id-toolbar-menu-multilevels'),
parentMenu: this.btnMultilevels.menu, parentMenu: this.btnMultilevels.menu,
restoreHeight: 164, restoreHeight: 92,
allowScrollbar: false, allowScrollbar: false,
store: new Common.UI.DataViewStore([ store: new Common.UI.DataViewStore([
{offsety: 0, data: {type: 2, subtype: -1}}, {offsety: 0, data: {type: 2, subtype: -1}},
{offsety: 74, data: {type: 2, subtype: 1}}, {offsety: 304, data: {type: 2, subtype: 1}},
{offsety: 148, data: {type: 2, subtype: 2}}, {offsety: 342, data: {type: 2, subtype: 2}},
{offsety: 222, data: {type: 2, subtype: 3}} {offsety: 380, data: {type: 2, subtype: 3}}
]), ]),
itemTemplate: _.template('<div id="<%= id %>" class="item-multilevellist" style="background-position: 0 -<%= offsety %>px;"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-markerlist" style="background-position: 0 -<%= offsety %>px;"></div>')
}); });
_conf && this.mnuMultilevelPicker.selectByIndex(_conf.index, true); _conf && this.mnuMultilevelPicker.selectByIndex(_conf.index, true);

BIN
apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
apps/documenteditor/main/resources/img/toolbar/bullets.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 584 B

BIN
apps/documenteditor/main/resources/img/toolbar/bullets@2x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
apps/documenteditor/main/resources/img/toolbar/multilevels-numbering.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
apps/documenteditor/main/resources/img/toolbar/multilevels-numbering@2x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.5 KiB

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

@ -41,19 +41,11 @@
} }
.item-markerlist { .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; width: 38px;
height: 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 { .color-schemas-menu {
span { span {
&.colors { &.colors {

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

@ -1215,7 +1215,7 @@ define([
this.btnNumbers.setMenu( this.btnNumbers.setMenu(
new Common.UI.Menu({ new Common.UI.Menu({
items: [ 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>')}
] ]
}) })
); );
@ -1262,19 +1262,19 @@ define([
this.mnuNumbersPicker = new Common.UI.DataView({ this.mnuNumbersPicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-numbering'), el: $('#id-toolbar-menu-numbering'),
parentMenu: this.btnNumbers.menu, parentMenu: this.btnNumbers.menu,
restoreHeight: 164, restoreHeight: 92,
allowScrollbar: false, allowScrollbar: false,
store: new Common.UI.DataViewStore([ store: new Common.UI.DataViewStore([
{offsety: 0, data: {type: 1, subtype: -1}}, {offsety: 0, data: {type: 1, subtype: -1}},
{offsety: 296, data: {type: 1, subtype: 4}}, {offsety: 570, data: {type: 1, subtype: 4}},
{offsety: 370, data: {type: 1, subtype: 5}}, {offsety: 532, data: {type: 1, subtype: 5}},
{offsety: 444, data: {type: 1, subtype: 6}}, {offsety: 608, data: {type: 1, subtype: 6}},
{offsety: 74, data: {type: 1, subtype: 1}}, {offsety: 418, data: {type: 1, subtype: 1}},
{offsety: 148, data: {type: 1, subtype: 2}}, {offsety: 456, data: {type: 1, subtype: 2}},
{offsety: 222, data: {type: 1, subtype: 3}}, {offsety: 494, data: {type: 1, subtype: 3}},
{offsety: 518, data: {type: 1, subtype: 7}} {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); _conf && this.mnuNumbersPicker.selectByIndex(_conf.index, true);

BIN
apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
apps/presentationeditor/main/resources/img/toolbar/bullets.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 584 B

BIN
apps/presentationeditor/main/resources/img/toolbar/bullets@2x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
apps/presentationeditor/main/resources/img/toolbar/numbering.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
apps/presentationeditor/main/resources/img/toolbar/numbering@2x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.8 KiB

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

@ -63,18 +63,11 @@
} }
.item-markerlist { .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; width: 38px;
height: 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 { .color-schemas-menu {
span { span {
&.colors { &.colors {