diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 1d6cc32fc..76220cbc1 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -542,6 +542,10 @@ } } + .img-toolbarmenu.btn-ic-docspell { + .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); diff --git a/apps/spreadsheeteditor/main/app/template/LeftMenu.template b/apps/spreadsheeteditor/main/app/template/LeftMenu.template index bc535469d..a5ff8e732 100644 --- a/apps/spreadsheeteditor/main/app/template/LeftMenu.template +++ b/apps/spreadsheeteditor/main/app/template/LeftMenu.template @@ -6,7 +6,7 @@ - + diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar-menu.png b/apps/spreadsheeteditor/main/resources/img/toolbar-menu.png index edd5e028c..0f0670bc8 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar-menu.png and b/apps/spreadsheeteditor/main/resources/img/toolbar-menu.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar-menu@2x.png b/apps/spreadsheeteditor/main/resources/img/toolbar-menu@2x.png index da77e65d6..ad9dd1399 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar-menu@2x.png and b/apps/spreadsheeteditor/main/resources/img/toolbar-menu@2x.png differ diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index 37c1a1cc1..7a666f012 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -7,29 +7,22 @@ .tool-menu-btns { border-right: 1px solid @gray-dark; - - .toolbar-btn-icon(btn-menu-file, 61, @toolbar-icon-size); - .toolbar-btn-icon(btn-menu-search, 62, @toolbar-icon-size); - .toolbar-btn-icon(btn-menu-comments, 63, @toolbar-icon-size); - .toolbar-btn-icon(btn-menu-chat, 59, @toolbar-icon-size); - .toolbar-btn-icon(btn-menu-about, 58, @toolbar-icon-size); - .toolbar-btn-icon(btn-menu-support, 75, @toolbar-icon-size); - .toolbar-btn-icon(btn-menu-plugin, 81, @toolbar-icon-size); - .toolbar-btn-icon(btn-menu-spellcheck, 81, @toolbar-icon-size); - - button.notify .btn-menu-chat, - button.notify.over > .btn-menu-chat {background-position: -0*@toolbar-icon-size -60*@toolbar-icon-size;} - button.notify:active > .btn-menu-chat {background-position: -1*@toolbar-icon-size -60*@toolbar-icon-size;} - button.notify.disabled > .btn-menu-chat {background-position: -2*@toolbar-icon-size -60*@toolbar-icon-size;} - - button.notify .btn-menu-comments, - button.notify.over > .btn-menu-comments {background-position: -0*@toolbar-icon-size -2*@toolbar-icon-size;} - button.notify:active > .btn-menu-comments {background-position: -1*@toolbar-icon-size -2*@toolbar-icon-size;} - button.notify.disabled > .btn-menu-comments {background-position: -2*@toolbar-icon-size -2*@toolbar-icon-size;} } } } +button.notify .btn-menu-chat {background-position: -0*@toolbar-icon-size -63*@toolbar-icon-size;} +button.notify .btn-menu-comments {background-position: -0*@toolbar-icon-size -60*@toolbar-icon-size;} + +.button-normal-icon(btn-menu-file, 61, @toolbar-icon-size); +.button-normal-icon(btn-menu-search, 62, @toolbar-icon-size); +.button-normal-icon(btn-menu-comments, 63, @toolbar-icon-size); +.button-normal-icon(btn-menu-chat, 59, @toolbar-icon-size); +.button-normal-icon(btn-menu-about, 58, @toolbar-icon-size); +.button-normal-icon(btn-menu-support, 75, @toolbar-icon-size); +.button-normal-icon(btn-menu-plugin, 81, @toolbar-icon-size); +.button-normal-icon(btn-ic-docspell, 93, @toolbar-icon-size); + #left-menu { &+.layout-resizer { border-left: 0 none; diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less index 6b939e5dd..2d16d42e1 100644 --- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less @@ -5,33 +5,6 @@ border-left: 1px solid @gray-dark; background-color: @gray-light; right: 0; - - /*menuText*/ - .toolbar-btn-icon(btn-menu-text, 64, @toolbar-icon-size); - - /*menuImage*/ - .toolbar-btn-icon(btn-menu-image, 34, @toolbar-icon-size); - - /*menuChart*/ - .toolbar-btn-icon(btn-menu-chart, 36, @toolbar-icon-size); - - /*menuShape*/ - .toolbar-btn-icon(btn-menu-shape, 47, @toolbar-icon-size); - - /*menuTextArt*/ - .toolbar-btn-icon(btn-menu-textart, 66, @toolbar-icon-size); - - /*menuTable*/ - .toolbar-btn-icon(btn-menu-table, 80, @toolbar-icon-size); - - /**menuSignature*/ - .toolbar-btn-icon(btn-menu-signature, 83, @toolbar-icon-size); - - /*menuPivot*/ - .toolbar-btn-icon(btn-menu-pivot, 87, @toolbar-icon-size); - - /*menuCell*/ - .toolbar-btn-icon(btn-menu-cell, 88, @toolbar-icon-size); } } @@ -105,6 +78,27 @@ } } +/*menuText*/ +.button-normal-icon(btn-menu-text, 64, @toolbar-icon-size); +/*menuImage*/ +.button-normal-icon(btn-menu-image, 34, @toolbar-icon-size); +/*menuChart*/ +.button-normal-icon(btn-menu-chart, 36, @toolbar-icon-size); +/*menuShape*/ +.button-normal-icon(btn-menu-shape, 47, @toolbar-icon-size); +/*menuTextArt*/ +.button-normal-icon(btn-menu-textart, 66, @toolbar-icon-size); +/*menuTable*/ +.button-normal-icon(btn-menu-table, 80, @toolbar-icon-size); +/**menuSignature*/ +.button-normal-icon(btn-menu-signature, 83, @toolbar-icon-size); +/*menuPivot*/ +.button-normal-icon(btn-menu-pivot, 87, @toolbar-icon-size); +/*menuCell*/ +.button-normal-icon(btn-menu-cell, 88, @toolbar-icon-size); + +.button-otherstates-icon2(btn-category, @toolbar-icon-size); + .btn-toolbar:not(.x-huge) .icon:not(svg).btn-borders-small { .background-ximage('@{common-image-path}/right-panels/SmallBorders.png', '@{common-image-path}/right-panels/SmallBorders@2x.png', 84px); }