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

[DE] restore 'image' icons instead of 'svg' in toolbar

Browse source
This commit is contained in:
Maxim Kadushkin 2019-10-21 16:54:06 +03:00
parent 048ba1e039
commit 4a0e4a5c2a
2 changed files with 17 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/common/main/resources/less/buttons.less
View file

@ -355,7 +355,6 @@
> .dropdown-toggle:first-child { > .dropdown-toggle:first-child {
.inner-box-caret { .inner-box-caret {
padding: 0 2px; padding: 0 2px;
float: right;
} }
} }

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

@ -292,8 +292,7 @@ define([
this.btnAlignLeft = new Common.UI.Button({ this.btnAlignLeft = new Common.UI.Button({
id: 'id-toolbar-btn-align-left', id: 'id-toolbar-btn-align-left',
cls: 'btn-toolbar', cls: 'btn-toolbar',
// iconCls: 'btn-align-left', iconCls: 'btn-align-left',
iconCls: 'svgicon svg-btn-align-left',
enableToggle: true, enableToggle: true,
allowDepress: false, allowDepress: false,
toggleGroup: 'alignGroup' toggleGroup: 'alignGroup'
@ -303,8 +302,7 @@ define([
this.btnAlignCenter = new Common.UI.Button({ this.btnAlignCenter = new Common.UI.Button({
id: 'id-toolbar-btn-align-center', id: 'id-toolbar-btn-align-center',
cls: 'btn-toolbar', cls: 'btn-toolbar',
// iconCls: 'btn-align-center', iconCls: 'btn-align-center',
iconCls: 'svgicon svg-btn-align-center',
enableToggle: true, enableToggle: true,
allowDepress: false, allowDepress: false,
toggleGroup: 'alignGroup' toggleGroup: 'alignGroup'
@ -314,8 +312,7 @@ define([
this.btnAlignRight = new Common.UI.Button({ this.btnAlignRight = new Common.UI.Button({
id: 'id-toolbar-btn-align-right', id: 'id-toolbar-btn-align-right',
cls: 'btn-toolbar', cls: 'btn-toolbar',
// iconCls: 'btn-align-right', iconCls: 'btn-align-right',
iconCls: 'svgicon svg-btn-align-right',
enableToggle: true, enableToggle: true,
allowDepress: false, allowDepress: false,
toggleGroup: 'alignGroup' toggleGroup: 'alignGroup'
@ -325,8 +322,7 @@ define([
this.btnAlignJust = new Common.UI.Button({ this.btnAlignJust = new Common.UI.Button({
id: 'id-toolbar-btn-align-just', id: 'id-toolbar-btn-align-just',
cls: 'btn-toolbar', cls: 'btn-toolbar',
// iconCls: 'btn-align-just', iconCls: 'btn-align-just',
iconCls: 'svgicon svg-btn-align-just',
enableToggle: true, enableToggle: true,
allowDepress: false, allowDepress: false,
toggleGroup: 'alignGroup' toggleGroup: 'alignGroup'
@ -382,24 +378,21 @@ define([
this.btnDecLeftOffset = new Common.UI.Button({ this.btnDecLeftOffset = new Common.UI.Button({
id: 'id-toolbar-btn-decoffset', id: 'id-toolbar-btn-decoffset',
cls: 'btn-toolbar', cls: 'btn-toolbar',
// iconCls: 'btn-decoffset' iconCls: 'btn-decoffset'
iconCls: 'svgicon svg-btn-decoffset'
}); });
this.paragraphControls.push(this.btnDecLeftOffset); this.paragraphControls.push(this.btnDecLeftOffset);
this.btnIncLeftOffset = new Common.UI.Button({ this.btnIncLeftOffset = new Common.UI.Button({
id: 'id-toolbar-btn-incoffset', id: 'id-toolbar-btn-incoffset',
cls: 'btn-toolbar', cls: 'btn-toolbar',
// iconCls: 'btn-incoffset' iconCls: 'btn-incoffset'
iconCls: 'svgicon svg-btn-incoffset'
}); });
this.paragraphControls.push(this.btnIncLeftOffset); this.paragraphControls.push(this.btnIncLeftOffset);
this.btnLineSpace = new Common.UI.Button({ this.btnLineSpace = new Common.UI.Button({
id: 'id-toolbar-btn-linespace', id: 'id-toolbar-btn-linespace',
cls: 'btn-toolbar', cls: 'btn-toolbar',
// iconCls: 'btn-linespace', iconCls: 'btn-linespace',
iconCls: 'svgicon svg-btn-linespace',
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
style: 'min-width: 60px;', style: 'min-width: 60px;',
items: [ items: [
@ -417,8 +410,7 @@ define([
this.btnShowHidenChars = new Common.UI.Button({ this.btnShowHidenChars = new Common.UI.Button({
id: 'id-toolbar-btn-hidenchars', id: 'id-toolbar-btn-hidenchars',
cls: 'btn-toolbar', cls: 'btn-toolbar',
// iconCls: 'btn-hidenchars', iconCls: 'btn-hidenchars',
iconCls: 'svgicon svg-btn-hidenchars',
enableToggle: true, enableToggle: true,
split: true, split: true,
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
@ -434,8 +426,7 @@ define([
this.btnMarkers = new Common.UI.Button({ this.btnMarkers = new Common.UI.Button({
id: 'id-toolbar-btn-markers', id: 'id-toolbar-btn-markers',
cls: 'btn-toolbar', cls: 'btn-toolbar',
// iconCls: 'btn-setmarkers', iconCls: 'btn-setmarkers',
iconCls: 'svgicon svg-btn-setmarkers',
enableToggle: true, enableToggle: true,
toggleGroup: 'markersGroup', toggleGroup: 'markersGroup',
split: true, split: true,
@ -447,8 +438,7 @@ define([
this.btnNumbers = new Common.UI.Button({ this.btnNumbers = new Common.UI.Button({
id: 'id-toolbar-btn-numbering', id: 'id-toolbar-btn-numbering',
cls: 'btn-toolbar', cls: 'btn-toolbar',
// iconCls: 'btn-numbering', iconCls: 'btn-numbering',
iconCls: 'svgicon svg-btn-numbering',
enableToggle: true, enableToggle: true,
toggleGroup: 'markersGroup', toggleGroup: 'markersGroup',
split: true, split: true,
@ -460,8 +450,7 @@ define([
this.btnMultilevels = new Common.UI.Button({ this.btnMultilevels = new Common.UI.Button({
id: 'id-toolbar-btn-multilevels', id: 'id-toolbar-btn-multilevels',
cls: 'btn-toolbar', cls: 'btn-toolbar',
// iconCls: 'btn-multilevels', iconCls: 'btn-multilevels',
iconCls: 'svgicon svg-btn-multilevels',
menu: true menu: true
}); });
this.paragraphControls.push(this.btnMultilevels); this.paragraphControls.push(this.btnMultilevels);
@ -486,8 +475,7 @@ define([
this.btnInsertTable = new Common.UI.Button({ this.btnInsertTable = new Common.UI.Button({
id: 'tlbtn-inserttable', id: 'tlbtn-inserttable',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
// iconCls: 'btn-inserttable', iconCls: 'btn-inserttable',
iconCls: 'svgicon svg-btn-inserttable',
caption: me.capBtnInsTable, caption: me.capBtnInsTable,
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [ items: [
@ -501,8 +489,7 @@ define([
this.btnInsertImage = new Common.UI.Button({ this.btnInsertImage = new Common.UI.Button({
id: 'tlbtn-insertimage', id: 'tlbtn-insertimage',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
// iconCls: 'btn-insertimage', iconCls: 'btn-insertimage',
iconCls: 'svgicon svg-btn-insertimage',
caption: me.capBtnInsImage, caption: me.capBtnInsImage,
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [ items: [
@ -518,8 +505,7 @@ define([
id: 'tlbtn-insertchart', id: 'tlbtn-insertchart',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
caption: me.capBtnInsChart, caption: me.capBtnInsChart,
// iconCls: 'btn-insertchart', iconCls: 'btn-insertchart',
iconCls: 'svgicon svg-btn-insertchart',
menu: true menu: true
}); });
this.paragraphControls.push(this.btnInsertChart); this.paragraphControls.push(this.btnInsertChart);
@ -549,8 +535,7 @@ define([
this.btnEditHeader = new Common.UI.Button({ this.btnEditHeader = new Common.UI.Button({
id: 'id-toolbar-btn-editheader', id: 'id-toolbar-btn-editheader',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
// iconCls: 'btn-editheader', iconCls: 'btn-editheader',
iconCls: 'svgicon svg-btn-editheader',
caption: me.capBtnInsHeader, caption: me.capBtnInsHeader,
menu: true menu: true
}); });
@ -581,8 +566,7 @@ define([
this.btnInsertShape = new Common.UI.Button({ this.btnInsertShape = new Common.UI.Button({
id: 'tlbtn-insertshape', id: 'tlbtn-insertshape',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
// iconCls: 'btn-insertshape', iconCls: 'btn-insertshape',
iconCls: 'svgicon svg-btn-insertshape',
caption: me.capBtnInsShape, caption: me.capBtnInsShape,
enableToggle: true, enableToggle: true,
menu: new Common.UI.Menu({cls: 'menu-shapes'}) menu: new Common.UI.Menu({cls: 'menu-shapes'})
@ -1342,7 +1326,7 @@ define([
_injectComponent('#slot-img-wrapping', this.btnImgWrapping); _injectComponent('#slot-img-wrapping', this.btnImgWrapping);
_injectComponent('#slot-btn-watermark', this.btnWatermark); _injectComponent('#slot-btn-watermark', this.btnWatermark);
this.btnsPageBreak = Common.Utils.injectButtons($host.find('.btn-slot.btn-pagebreak'), '', /*'btn-pagebreak'*/'svgicon svg-btn-pagebreak', this.capBtnInsPagebreak, undefined, true, true); this.btnsPageBreak = Common.Utils.injectButtons($host.find('.btn-slot.btn-pagebreak'), '', 'btn-pagebreak', this.capBtnInsPagebreak, undefined, true, true);
Array.prototype.push.apply(this.paragraphControls, this.btnsPageBreak); Array.prototype.push.apply(this.paragraphControls, this.btnsPageBreak);
return $host; return $host;