Skip to content

W
web-apps
Commit 70c2a58b authored by Julia Radzhabova's avatar Julia Radzhabova
Browse files
Options

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

parent ec44f1ec
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 44 deletions
apps/documenteditor/main/app/view/Toolbar.js
View file @ 70c2a58b
...@@ -1220,15 +1220,16 @@ define([ ...@@ -1220,15 +1220,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>') }
] ]
}) })
); );
...@@ -1353,19 +1354,19 @@ define([ ...@@ -1353,19 +1354,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);
...@@ -1373,15 +1374,15 @@ define([ ...@@ -1373,15 +1374,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);
......
apps/documenteditor/main/resources/less/toolbar.less
View file @ 70c2a58b
...@@ -84,19 +84,11 @@ ...@@ -84,19 +84,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 {
......
apps/presentationeditor/main/app/view/Toolbar.js
View file @ 70c2a58b
...@@ -1182,7 +1182,7 @@ define([ ...@@ -1182,7 +1182,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>') }
] ]
}) })
); );
...@@ -1229,19 +1229,19 @@ define([ ...@@ -1229,19 +1229,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);
......
apps/presentationeditor/main/resources/less/toolbar.less
View file @ 70c2a58b
...@@ -121,18 +121,11 @@ ...@@ -121,18 +121,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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7