[style] big button's icon size change to 28x28

This commit is contained in:
Maxim Kadushkin 2019-10-16 11:30:33 +03:00
parent 891e3435d4
commit fff79264b5
3 changed files with 76 additions and 78 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

View file

@ -1,5 +1,6 @@
@x-huge-btn-height: 46px;
@btn-disabled-opacity: .4;
@x-huge-btn-icon-size: 28px;
.btn {
border-radius: 1px;
@ -99,7 +100,7 @@
}
&.x-huge {
@icon-size: 26px;
@icon-size: 28px;
min-width: 45px;
height: @x-huge-btn-height;
@ -122,8 +123,8 @@
}
.icon:not(svg) {
width: @icon-size;
height: @icon-size;
width: @x-huge-btn-icon-size;
height: @x-huge-btn-icon-size;
min-width: 0;
}
@ -186,10 +187,8 @@
.icon-top {
&.x-huge {
@icon-size: 26px;
.btn&, .btn-group& .btn-toolbar {
.mx-button-otherstates-icon2(@icon-size);
.mx-button-otherstates-icon2(@x-huge-btn-icon-size);
}
.btn.small {

View file

@ -463,76 +463,75 @@
.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);
.button-normal-icon(btn-dropcap, 18, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-pagebreak', 19, @toolbar-big-icon-size);
.button-normal-icon(btn-editheader, 20, @toolbar-big-icon-size);
.button-normal-icon(btn-pageorient, 21, @toolbar-big-icon-size);
.button-normal-icon(btn-pagemargins, 22, @toolbar-big-icon-size);
.button-normal-icon(btn-pagesize, 23, @toolbar-big-icon-size);
.button-normal-icon(btn-columns, 24, @toolbar-big-icon-size);
.button-normal-icon(btn-img-align, 25, @toolbar-big-icon-size);
.button-normal-icon(btn-img-group, 26, @toolbar-big-icon-size);
.button-normal-icon(btn-img-bkwd, 27, @toolbar-big-icon-size);
.button-normal-icon(btn-img-frwd, 28, @toolbar-big-icon-size);
.button-normal-icon(btn-img-wrap, 29, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-ic-reviewview', 30, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-ic-sharing', 31, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-ic-coedit', 32, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-ic-chat', 33, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-ic-history', 34, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-ic-protect', 35, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-ic-signature', 36, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-add-pivot', 37, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-update-pivot', 38, @toolbar-big-icon-size);
.button-normal-icon(btn-contents-update, 38, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-pivot-layout', 39, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-blank-rows', 43, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-subtotals', 46, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-grand-totals', 52, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-contents', 53, @toolbar-big-icon-size);
.button-normal-icon(btn-controls, 54, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-select-pivot', 55, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-bookmarks', 56, @toolbar-big-icon-size);
.button-normal-icon(btn-blankpage, 57, @toolbar-big-icon-size);
.button-normal-icon(btn-print-area, 58, @toolbar-big-icon-size);
.button-normal-icon(btn-cell-group, 59, @toolbar-big-icon-size);
.button-normal-icon(btn-cell-ungroup, 60, @toolbar-big-icon-size);
.button-normal-icon(btn-to-columns, 61, @toolbar-big-icon-size);
.button-normal-icon(btn-watermark, 63, @toolbar-big-icon-size);
.button-normal-icon(btn-color-schema, 64, @toolbar-big-icon-size);
.button-normal-icon(btn-ins-formula, 65, @toolbar-big-icon-size);
.button-normal-icon(btn-autosum, 66, @toolbar-big-icon-size);
.button-normal-icon(btn-recent, 67, @toolbar-big-icon-size);
.button-normal-icon(btn-finance, 68, @toolbar-big-icon-size);
.button-normal-icon(btn-logic, 69, @toolbar-big-icon-size);
.button-normal-icon(btn-func-text, 70, @toolbar-big-icon-size);
.button-normal-icon(btn-datetime, 71, @toolbar-big-icon-size);
.button-normal-icon(btn-lookup, 72, @toolbar-big-icon-size);
.button-normal-icon(btn-func-math, 73, @toolbar-big-icon-size);
.button-normal-icon(btn-more, 74, @toolbar-big-icon-size);
.button-normal-icon(btn-pagenum, 75, @toolbar-big-icon-size);
.button-normal-icon(btn-caption, 76, @toolbar-big-icon-size);
.button-normal-icon(btn-calculation, 80, @toolbar-big-icon-size);
.button-normal-icon(btn-scale, 81, @toolbar-big-icon-size);
.button-normal-icon(btn-inserttable, 0, @x-huge-btn-icon-size);
.button-normal-icon(btn-insertimage, 1, @x-huge-btn-icon-size);
.button-normal-icon(btn-insertchart, 2, @x-huge-btn-icon-size);
.button-normal-icon(btn-text, 3, @x-huge-btn-icon-size);
.button-normal-icon(btn-insertshape, 4, @x-huge-btn-icon-size);
.button-normal-icon(btn-ic-doclang, 5, @x-huge-btn-icon-size);
.button-normal-icon(btn-textart, 6, @x-huge-btn-icon-size);
.button-normal-icon(btn-insertequation, 7, @x-huge-btn-icon-size);
.button-normal-icon(btn-notes, 8, @x-huge-btn-icon-size);
.button-normal-icon(btn-inserthyperlink, 9, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-menu-comments', 10, @x-huge-btn-icon-size);
.button-normal-icon(btn-addslide, 11, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-ic-docspell', 12, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-ic-review', 13, @x-huge-btn-icon-size);
.button-normal-icon(review-save, 14, @x-huge-btn-icon-size);
.button-normal-icon(review-deny, 15, @x-huge-btn-icon-size);
.button-normal-icon(review-next, 16, @x-huge-btn-icon-size);
.button-normal-icon(review-prev, 17, @x-huge-btn-icon-size);
.button-normal-icon(btn-dropcap, 18, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-pagebreak', 19, @x-huge-btn-icon-size);
.button-normal-icon(btn-editheader, 20, @x-huge-btn-icon-size);
.button-normal-icon(btn-pageorient, 21, @x-huge-btn-icon-size);
.button-normal-icon(btn-pagemargins, 22, @x-huge-btn-icon-size);
.button-normal-icon(btn-pagesize, 23, @x-huge-btn-icon-size);
.button-normal-icon(btn-columns, 24, @x-huge-btn-icon-size);
.button-normal-icon(btn-img-align, 25, @x-huge-btn-icon-size);
.button-normal-icon(btn-img-group, 26, @x-huge-btn-icon-size);
.button-normal-icon(btn-img-bkwd, 27, @x-huge-btn-icon-size);
.button-normal-icon(btn-img-frwd, 28, @x-huge-btn-icon-size);
.button-normal-icon(btn-img-wrap, 29, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-ic-reviewview', 30, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-ic-sharing', 31, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-ic-coedit', 32, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-ic-chat', 33, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-ic-history', 34, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-ic-protect', 35, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-ic-signature', 36, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-add-pivot', 37, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-update-pivot', 38, @x-huge-btn-icon-size);
.button-normal-icon(btn-contents-update, 38, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-pivot-layout', 39, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-blank-rows', 43, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-subtotals', 46, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-grand-totals', 52, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-contents', 53, @x-huge-btn-icon-size);
.button-normal-icon(btn-controls, 54, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-select-pivot', 55, @x-huge-btn-icon-size);
.button-normal-icon(~'x-huge .btn-bookmarks', 56, @x-huge-btn-icon-size);
.button-normal-icon(btn-blankpage, 57, @x-huge-btn-icon-size);
.button-normal-icon(btn-print-area, 58, @x-huge-btn-icon-size);
.button-normal-icon(btn-cell-group, 59, @x-huge-btn-icon-size);
.button-normal-icon(btn-cell-ungroup, 60, @x-huge-btn-icon-size);
.button-normal-icon(btn-to-columns, 61, @x-huge-btn-icon-size);
.button-normal-icon(btn-watermark, 63, @x-huge-btn-icon-size);
.button-normal-icon(btn-color-schema, 64, @x-huge-btn-icon-size);
.button-normal-icon(btn-ins-formula, 65, @x-huge-btn-icon-size);
.button-normal-icon(btn-autosum, 66, @x-huge-btn-icon-size);
.button-normal-icon(btn-recent, 67, @x-huge-btn-icon-size);
.button-normal-icon(btn-finance, 68, @x-huge-btn-icon-size);
.button-normal-icon(btn-logic, 69, @x-huge-btn-icon-size);
.button-normal-icon(btn-func-text, 70, @x-huge-btn-icon-size);
.button-normal-icon(btn-datetime, 71, @x-huge-btn-icon-size);
.button-normal-icon(btn-lookup, 72, @x-huge-btn-icon-size);
.button-normal-icon(btn-func-math, 73, @x-huge-btn-icon-size);
.button-normal-icon(btn-more, 74, @x-huge-btn-icon-size);
.button-normal-icon(btn-pagenum, 75, @x-huge-btn-icon-size);
.button-normal-icon(btn-caption, 76, @x-huge-btn-icon-size);
.button-normal-icon(btn-calculation, 80, @x-huge-btn-icon-size);
.button-normal-icon(btn-scale, 81, @x-huge-btn-icon-size);
[applang=ru] {
.btn-toolbar {
@ -549,8 +548,8 @@
.background-ximage('@{common-image-path}/controls/toolbar-menu-ru.png', '@{common-image-path}/controls/toolbar-menu-ru@2x.png', 60px);
}
.button-normal-icon(btn-notes, 77, @toolbar-big-icon-size);
.button-normal-icon(btn-controls, 78, @toolbar-big-icon-size);
.button-normal-icon(btn-notes, 77, @x-huge-btn-icon-size);
.button-normal-icon(btn-controls, 78, @x-huge-btn-icon-size);
.button-normal-icon(btn-bold, 0, @toolbar-icon-size);
.button-normal-icon(btn-italic, 1, @toolbar-icon-size);