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

debug toolbar's big buttons

Browse source
This commit is contained in:
Maxim Kadushkin 2017-06-28 14:16:09 +03:00
parent 7f68ab09b6
commit c529667cb4
9 changed files with 47 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
apps/common/main/resources/img/controls/toolbarbig.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
apps/common/main/resources/img/controls/toolbarbig@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

20
apps/common/main/resources/less/toolbar.less
View file

@ -261,3 +261,23 @@
}
.button-otherstates-icon2(btn-toolbar, @toolbar-icon-size);
@toolbar-big-icon-size: 26px;
.button-normal-icon(btn-inserttable, 0, @toolbar-big-icon-size);
.button-normal-icon(btn-insertimage, 1, @toolbar-big-icon-size);
.button-normal-icon(btn-insertchart, 2, @toolbar-big-icon-size);
.button-normal-icon(btn-text, 3, @toolbar-big-icon-size);
.button-normal-icon(btn-insertshape, 4, @toolbar-big-icon-size);
.button-normal-icon(btn-ic-doclang, 5, @toolbar-big-icon-size);
.button-normal-icon(btn-textart, 6, @toolbar-big-icon-size);
.button-normal-icon(btn-insertequation, 7, @toolbar-big-icon-size);
.button-normal-icon(btn-notes, 8, @toolbar-big-icon-size);
.button-normal-icon(btn-inserthyperlink, 9, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-menu-comments', 10, @toolbar-big-icon-size);
.button-normal-icon(btn-addslide, 11, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-ic-docspell', 12, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-ic-review', 13, @toolbar-big-icon-size);
.button-normal-icon(review-save, 14, @toolbar-big-icon-size);
.button-normal-icon(review-deny, 15, @toolbar-big-icon-size);
.button-normal-icon(review-next, 16, @toolbar-big-icon-size);
.button-normal-icon(review-prev, 17, @toolbar-big-icon-size);

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

@ -225,7 +225,6 @@
}
@toolbar-icon-size: 20px;
@toolbar-big-icon-size: 26px;
.button-normal-icon(btn-align-center, 0, @toolbar-icon-size);
.button-normal-icon(btn-align-just, 1, @toolbar-icon-size);
.button-normal-icon(btn-align-left, 2, @toolbar-icon-size);
@ -302,24 +301,6 @@
//.button-normal-icon(review-save, 81, @toolbar-icon-size);
//.button-normal-icon(review-deny, 82, @toolbar-icon-size);
.button-normal-icon(btn-inserttable, 0, @toolbar-big-icon-size);
.button-normal-icon(btn-insertimage, 1, @toolbar-big-icon-size);
.button-normal-icon(btn-insertshape, 2, @toolbar-big-icon-size);
.button-normal-icon(btn-text, 3, @toolbar-big-icon-size);
.button-normal-icon(btn-inserthyperlink, 4, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-menu-comments', 5, @toolbar-big-icon-size);
.button-normal-icon(btn-textart, 6, @toolbar-big-icon-size);
.button-normal-icon(btn-insertequation, 7, @toolbar-big-icon-size);
.button-normal-icon(btn-insertchart, 9, @toolbar-big-icon-size);
.button-normal-icon(btn-notes, 8, @toolbar-big-icon-size);
.button-normal-icon(btn-ic-doclang, 11, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-ic-docspell', 12, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-ic-review', 13, @toolbar-big-icon-size);
.button-normal-icon(review-save, 14, @toolbar-big-icon-size);
.button-normal-icon(review-deny, 15, @toolbar-big-icon-size);
.button-normal-icon(review-next, 16, @toolbar-big-icon-size);
.button-normal-icon(review-prev, 17, @toolbar-big-icon-size);
@menu-icon-size: 22px;
.menu-icon-normal(mnu-wrap-inline, 0, @menu-icon-size);
.menu-icon-normal(mnu-wrap-square, 1, @menu-icon-size);

2
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -2068,7 +2068,7 @@ define([
var button = new Common.UI.Button({
cls: _cls,
iconCls: 'svgicon svg-btn-comments',
iconCls: 'btn-menu-comments',
caption: me.toolbar.capBtnComment
}).render( slots.eq(index) );

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

@ -1016,7 +1016,7 @@ define([
slot: '.slot-inserttext',
btnconfig: {
cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-inserttext',
iconCls : 'btn-text',
caption : me.capInsertText,
lock : [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart],
enableToggle: true,

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

@ -258,13 +258,13 @@
.toolbar-btn-icon(btn-align-shape, 38, @toolbar-icon-size);
//.toolbar-btn-icon(btn-insertshape, 39, @toolbar-icon-size);
.button-normal-icon(btn-insertshape, 39, @toolbar-icon-size);
//.button-normal-icon(btn-insertshape, 39, @toolbar-icon-size);
.toolbar-btn-icon(btn-inserttext, 40, @toolbar-icon-size);
.toolbar-btn-icon(btn-inserthyperlink, 41, @toolbar-icon-size);
.toolbar-btn-icon(btn-inserttable, 42, @toolbar-icon-size);
.toolbar-btn-icon(btn-insertimage, 43, @toolbar-icon-size);
.toolbar-btn-icon(btn-insertchart, 44, @toolbar-icon-size);
//.toolbar-btn-icon(btn-inserttext, 40, @toolbar-icon-size);
//.toolbar-btn-icon(btn-inserthyperlink, 41, @toolbar-icon-size);
//.toolbar-btn-icon(btn-inserttable, 42, @toolbar-icon-size);
//.toolbar-btn-icon(btn-insertimage, 43, @toolbar-icon-size);
//.toolbar-btn-icon(btn-insertchart, 44, @toolbar-icon-size);
.toolbar-btn-icon(btn-colorschemas, 45, @toolbar-icon-size);
.toolbar-btn-icon(btn-slidesize, 46, @toolbar-icon-size);
.toolbar-btn-icon(btn-hidebars, 47, @toolbar-icon-size);
@ -272,21 +272,21 @@
.toolbar-btn-icon(btn-zoomin, 61, @toolbar-icon-size);
.toolbar-btn-icon(btn-zoomout, 60, @toolbar-icon-size);
.toolbar-btn-icon(btn-save-coauth, 69, @toolbar-icon-size);
.toolbar-btn-icon(btn-insertequation, 74, @toolbar-icon-size);
//.toolbar-btn-icon(btn-insertequation, 74, @toolbar-icon-size);
// add slide
.btn-toolbar .btn-addslide {background-position: 0 -120px;}
.btn-toolbar.active > .btn-addslide,
.btn-toolbar:active > .btn-addslide {background-position: -20px -120px;}
.btn-toolbar.disabled:not(.active) > .btn-addslide {background-position: -40px -120px;}
.btn-toolbar.disabled > .btn-addslide {background-position: -20px -120px; opacity: 0.6;}
//.btn-toolbar .btn-addslide {background-position: 0 -120px;}
//.btn-toolbar.active > .btn-addslide,
//.btn-toolbar:active > .btn-addslide {background-position: -20px -120px;}
//.btn-toolbar.disabled:not(.active) > .btn-addslide {background-position: -40px -120px;}
//.btn-toolbar.disabled > .btn-addslide {background-position: -20px -120px; opacity: 0.6;}
.btn-toolbar.large .btn-addslide {background-position: 0px -5px;}
//.btn-group.open .btn-toolbar.large > .btn-addslide,
.btn-toolbar.large.active > .btn-addslide,
.btn-toolbar.large:active > .btn-addslide {background-position: 0px -45px;}
.btn-toolbar.large.disabled:not(.active) > .btn-addslide {background-position: 0px -85px;}
.btn-toolbar.large.disabled > .btn-addslide {background-position: 0px -45px; opacity: 0.6;}
//.btn-toolbar.large .btn-addslide {background-position: 0px -5px;}
////.btn-group.open .btn-toolbar.large > .btn-addslide,
//.btn-toolbar.large.active > .btn-addslide,
//.btn-toolbar.large:active > .btn-addslide {background-position: 0px -45px;}
//.btn-toolbar.large.disabled:not(.active) > .btn-addslide {background-position: 0px -85px;}
//.btn-toolbar.large.disabled > .btn-addslide {background-position: 0px -45px; opacity: 0.6;}
@menu-icon-size: 22px;
.menu-btn-icon(mnu-align-center, 0, @menu-icon-size);

2
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -2893,7 +2893,7 @@ define([
var button = new Common.UI.Button({
cls: _cls,
iconCls: 'svgicon svg-btn-comments',
iconCls: 'btn-menu-comments',
caption: me.toolbar.capBtnComment
}).render( slots.eq(index) );

12
apps/spreadsheeteditor/main/resources/less/toolbar.less
View file

@ -128,9 +128,9 @@
.toolbar-btn-icon(btn-border-center, 31, @toolbar-icon-size);
.toolbar-btn-icon(btn-border-hmiddle, 32, @toolbar-icon-size);
.toolbar-btn-icon(btn-border-vmiddle, 33, @toolbar-icon-size);
.toolbar-btn-icon(btn-insertimage, 34, @toolbar-icon-size);
.toolbar-btn-icon(btn-inserthyperlink, 35, @toolbar-icon-size);
.toolbar-btn-icon(btn-insertchart, 36, @toolbar-icon-size);
//.toolbar-btn-icon(btn-insertimage, 34, @toolbar-icon-size);
//.toolbar-btn-icon(btn-inserthyperlink, 35, @toolbar-icon-size);
//.toolbar-btn-icon(btn-insertchart, 36, @toolbar-icon-size);
.toolbar-btn-icon(btn-copy, 37, @toolbar-icon-size);
.toolbar-btn-icon(btn-paste, 38, @toolbar-icon-size);
.toolbar-btn-icon(btn-synch, 39, @toolbar-icon-size);
@ -141,8 +141,8 @@
.toolbar-btn-icon(btn-incfont, 44, @toolbar-icon-size);
.toolbar-btn-icon(btn-decfont, 45, @toolbar-icon-size);
.toolbar-btn-icon(btn-text-orient, 46, @toolbar-icon-size);
.toolbar-btn-icon(btn-insertshape, 47, @toolbar-icon-size);
.toolbar-btn-icon(btn-text, 48, @toolbar-icon-size);
//.toolbar-btn-icon(btn-insertshape, 47, @toolbar-icon-size);
//.toolbar-btn-icon(btn-text, 48, @toolbar-icon-size);
.toolbar-btn-icon(btn-sort-up, 49, @toolbar-icon-size);
.toolbar-btn-icon(btn-clear-filter, 50, @toolbar-icon-size);
.toolbar-btn-icon(btn-percent-style, 51, @toolbar-icon-size);
@ -164,7 +164,7 @@
.toolbar-btn-icon(btn-border-diagdown, 43, @toolbar-icon-size);
.toolbar-btn-icon(btn-named-range, 77, @toolbar-icon-size);
.toolbar-btn-icon(btn-insertequation, 82, @toolbar-icon-size);
//.toolbar-btn-icon(btn-insertequation, 82, @toolbar-icon-size);
@menu-icon-size: 22px;
.menu-btn-icon(mnu-align-center, 0, @menu-icon-size);