diff --git a/apps/common/main/resources/img/controls/toolbarbig.png b/apps/common/main/resources/img/controls/toolbarbig.png new file mode 100644 index 000000000..988d87fdd Binary files /dev/null and b/apps/common/main/resources/img/controls/toolbarbig.png differ diff --git a/apps/common/main/resources/img/controls/toolbarbig@2x.png b/apps/common/main/resources/img/controls/toolbarbig@2x.png new file mode 100644 index 000000000..073facaba Binary files /dev/null and b/apps/common/main/resources/img/controls/toolbarbig@2x.png differ diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 4118cd3c1..04e6bc83f 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -85,7 +85,7 @@ } } -.icon-top { +.btn.icon-top, .btn-group.icon-top { display: inline-flex; flex-direction: column; @@ -100,12 +100,24 @@ &.x-huge, .x-huge { + @icon-size: 26px; + min-width: 45px; height: 45px; img { height: 27px; } + + .inner-box-caption { + line-height: 18px; + } + + .icon { + width: @icon-size; + height: @icon-size; + min-width: 0; + } } .inner-box-icon { @@ -114,6 +126,8 @@ align-items: center; justify-content: center; line-height: 20px; + max-height: 26px; + height: 26px; } .inner-box-caption { @@ -122,11 +136,14 @@ } } -.btn-group { - .x-huge { - .inner-box-caption { - line-height: 18px; +.icon-top { + &.x-huge { + @icon-size: 26px; + + .btn&, .btn-group& .btn-toolbar { + .mx-button-otherstates-icon2(@icon-size); } + } } @@ -169,11 +186,28 @@ margin: 0; display: inline-block; background-repeat: no-repeat; - .background-ximage('@{app-image-path}/toolbar-menu.png', '@{app-image-path}/toolbar-menu@2x.png', 60px); - width: 20px; - height: 20px; - line-height: 20px; + &:not(.x-huge) { + width: 20px; + height: 20px; + line-height: 20px; + } + + &:not(svg):not(.x-huge){ + .background-ximage('@{app-image-path}/toolbar-menu.png', '@{app-image-path}/toolbar-menu@2x.png', 60px); + } + } + + &.x-huge, .btn-group.x-huge > & { + :not(svg).icon { + .background-ximage('@{common-image-path}/controls/toolbarbig.png', '@{common-image-path}/controls/toolbarbig@2x.png', 96px); + } + } + + &:not(.x-huge) { + .icon { + //.background-ximage('@{app-image-path}/toolbar-menu.png', '@{app-image-path}/toolbar-menu@2x.png', 60px); + } } &.dropdown-toggle { diff --git a/apps/documenteditor/main/resources/less/statusbar.less b/apps/documenteditor/main/resources/less/statusbar.less index 79b30f807..98b196f4a 100644 --- a/apps/documenteditor/main/resources/less/statusbar.less +++ b/apps/documenteditor/main/resources/less/statusbar.less @@ -214,7 +214,4 @@ .button-normal-icon(btn-ic-zoomtowidth, 55, @toolbar-icon-size); .button-normal-icon(btn-ic-zoomtopage, 56, @toolbar-icon-size); -.button-normal-icon(btn-ic-review, 61, @toolbar-icon-size); -.button-normal-icon(btn-ic-doclang, 67, @toolbar-icon-size); -.button-normal-icon(btn-ic-docspell, 69, @toolbar-icon-size); .button-normal-icon(btn-ic-changes, 68, @toolbar-icon-size); diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index ae9d0ac2a..706edb28c 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -225,6 +225,7 @@ } @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); @@ -241,8 +242,6 @@ .button-normal-icon(btn-fontcolor, 14, @toolbar-icon-size); .button-normal-icon(btn-incoffset, 15, @toolbar-icon-size); .button-normal-icon(btn-incfont, 16, @toolbar-icon-size); -.button-normal-icon(btn-insertimage, 17, @toolbar-icon-size); -.button-normal-icon(btn-inserttable, 18, @toolbar-icon-size); .button-normal-icon(btn-italic, 19, @toolbar-icon-size); .button-normal-icon(btn-linespace, 20, @toolbar-icon-size); .button-normal-icon(btn-setmarkers, 21, @toolbar-icon-size); @@ -261,23 +260,21 @@ .button-normal-icon(btn-underline, 35, @toolbar-icon-size); .button-normal-icon(btn-undo, 36, @toolbar-icon-size); .button-normal-icon(btn-hidenchars, 37, @toolbar-icon-size); -.button-normal-icon(btn-inserthyperlink, 38, @toolbar-icon-size); .button-normal-icon(btn-editheader, 39, @toolbar-icon-size); .button-normal-icon(btn-mailrecepients, 40, @toolbar-icon-size); .button-normal-icon(btn-synch, 42, @toolbar-icon-size); .button-normal-icon(btn-save-coauth, 41, @toolbar-icon-size); -.button-normal-icon(btn-insertshape, 43, @toolbar-icon-size); .button-normal-icon(btn-colorschemas, 44, @toolbar-icon-size); -.button-normal-icon(btn-insertchart, 45, @toolbar-icon-size); -.button-normal-icon(btn-text, 46, @toolbar-icon-size); .button-normal-icon(btn-hidebars, 47, @toolbar-icon-size); .button-normal-icon(btn-settings, 48, @toolbar-icon-size); .button-normal-icon(btn-dropcap, 50, @toolbar-icon-size); -.button-normal-icon(btn-insertequation, 53, @toolbar-icon-size); //.toolbar-btn-icon(btn-bold, 5, @toolbar-icon-size); .button-normal-icon(btn-zoomup, 57, @toolbar-icon-size); .button-normal-icon(btn-zoomdown, 58, @toolbar-icon-size); +.button-normal-icon(btn-ic-review, 61, @toolbar-icon-size); +.button-normal-icon(btn-ic-docspell, 69, @toolbar-icon-size); + .button-normal-icon(mmerge-next, 71, @toolbar-icon-size); .button-normal-icon(mmerge-last, 72, @toolbar-icon-size); .button-normal-icon(mmerge-prev, 73, @toolbar-icon-size); @@ -285,10 +282,6 @@ .button-normal-icon(btn-columns, 75, @toolbar-icon-size); .button-normal-icon(btn-pagemargins, 76, @toolbar-icon-size); .button-normal-icon(btn-notes, 78, @toolbar-icon-size); -.button-normal-icon(review-prev, 79, @toolbar-icon-size); -.button-normal-icon(review-next, 80, @toolbar-icon-size); -.button-normal-icon(review-save, 81, @toolbar-icon-size); -.button-normal-icon(review-deny, 82, @toolbar-icon-size); .button-normal-icon(btn-img-frwd, 83, @toolbar-icon-size); .button-normal-icon(btn-img-bkwd, 84, @toolbar-icon-size); .button-normal-icon(btn-img-wrap, 85, @toolbar-icon-size); @@ -296,6 +289,35 @@ .button-normal-icon(btn-img-align, 87, @toolbar-icon-size); .button-normal-icon(btn-goback, 88, @toolbar-icon-size); +//.button-normal-icon(btn-insertimage, 17, @toolbar-icon-size); +//.button-normal-icon(btn-inserttable, 18, @toolbar-icon-size); +//.button-normal-icon(btn-inserthyperlink, 38, @toolbar-icon-size); +//.button-normal-icon(btn-insertshape, 43, @toolbar-icon-size); +//.button-normal-icon(btn-insertchart, 45, @toolbar-icon-size); +//.button-normal-icon(btn-insertequation, 53, @toolbar-icon-size); +//.button-normal-icon(btn-text, 46, @toolbar-icon-size); +//.button-normal-icon(btn-ic-doclang, 67, @toolbar-icon-size); +//.button-normal-icon(review-prev, 79, @toolbar-icon-size); +//.button-normal-icon(review-next, 80, @toolbar-icon-size); +//.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-insertequation, 7, @toolbar-big-icon-size); +.button-normal-icon(btn-insertchart, 9, @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);