From 891e3435d4f43cd13fa14e5eedba5c23faf1eba9 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 15 Oct 2019 16:11:19 +0300 Subject: [PATCH] [DE] applied 1.5x icons on toolbar (svg + png) --- apps/common/main/lib/component/Button.js | 5 +- .../img/controls/toolbarbig@1.5x.png | Bin 0 -> 14632 bytes .../main/resources/img/header/buttons.svg | 114 +++++++++++++ .../main/resources/img/header/buttons150.svg | 154 +++++++++++++++++- .../main/resources/less/asc-mixins.less | 3 + apps/common/main/resources/less/buttons.less | 42 ++++- apps/common/main/resources/less/header.less | 8 + apps/documenteditor/main/app/view/Toolbar.js | 50 ++++-- .../main/resources/img/toolbar-menu@1.5x.png | Bin 0 -> 11602 bytes 9 files changed, 352 insertions(+), 24 deletions(-) create mode 100644 apps/common/main/resources/img/controls/toolbarbig@1.5x.png create mode 100644 apps/documenteditor/main/resources/img/toolbar-menu@1.5x.png diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index 687fb3c23..6bca49533 100644 --- a/apps/common/main/lib/component/Button.js +++ b/apps/common/main/lib/component/Button.js @@ -187,8 +187,9 @@ define([ '' + '<% } else { %>' + '<% if (/svgicon/.test(iconCls)) {' + - 'print(\'\');' + - '} else ' + + 'print(\'' + + '\');' + + '} else ' + 'print(\' \'); %>' + '<% } %>'; diff --git a/apps/common/main/resources/img/controls/toolbarbig@1.5x.png b/apps/common/main/resources/img/controls/toolbarbig@1.5x.png new file mode 100644 index 0000000000000000000000000000000000000000..315ce30141248f178f6d2fc43ce2ef8277bc6c62 GIT binary patch literal 14632 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 Ya5dNJe=rL-asJg*m0l}W%3Fl}58T9Or2qf` literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/header/buttons.svg b/apps/common/main/resources/img/header/buttons.svg index b808b1cb7..7b8046f07 100644 --- a/apps/common/main/resources/img/header/buttons.svg +++ b/apps/common/main/resources/img/header/buttons.svg @@ -67,4 +67,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/common/main/resources/img/header/buttons150.svg b/apps/common/main/resources/img/header/buttons150.svg index 1534f858f..ae53c467c 100644 --- a/apps/common/main/resources/img/header/buttons150.svg +++ b/apps/common/main/resources/img/header/buttons150.svg @@ -8,10 +8,9 @@ - - - + + + @@ -21,4 +20,151 @@ L9.333,21H9H7c-0.449,0-1-0.552-1-1V8.656C6,8.401,6.318,8,6.594,8 M23.5,7h-17C5.671,7,5,7.653,5,8.462V20c0,1,1,2,2,2h2l4,3l4-3 h6c1,0,2-1,2-2V8.462C25,7.653,24.329,7,23.5,7L23.5,7z"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less index 508f59f61..e701bda90 100644 --- a/apps/common/main/resources/less/asc-mixins.less +++ b/apps/common/main/resources/less/asc-mixins.less @@ -110,6 +110,9 @@ .icon {background-position-x: -1*@icon-size; --bgX: -(1*@icon-size);} } } + + &.active svg.icon, + &:active svg.icon {fill:#fff;} } .button-otherstates-icon2(@icon-class, @icon-size) { diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index c7abef83e..7d68f554d 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -121,12 +121,25 @@ } } - .icon { + .icon:not(svg) { width: @icon-size; height: @icon-size; min-width: 0; } + svg.icon { + width: 28px; + height: 28px; + + @media + only screen and (-webkit-min-device-pixel-ratio: 1.5), + only screen and (min-resolution: 1.5dppx), + only screen and (min-resolution: 144dpi) { + width:calc(~"40px/1.5"); + height:calc(~"40px/1.5"); + } + } + button.small .icon { width: 20px; height: 20px; @@ -237,13 +250,39 @@ line-height: 20px; &:not(svg) { + @media + only screen and (-webkit-min-device-pixel-ratio: 1.5), + only screen and (min-resolution: 1.5dppx), + only screen and (min-resolution: 144dpi) { + background-image: ~"url('@{app-image-const-path}/toolbar-menu@1.5x.png')"; + background-size: 60px auto; + } + .background-ximage('@{app-image-path}/toolbar-menu.png', '@{app-image-path}/toolbar-menu@2x.png', 60px); } } + + svg.icon { + @media + only screen and (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9), + only screen and (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx), + only screen and (min-resolution: 144dpi) and (max-resolution: 143dpi) { + width:calc(~"28px/1.5"); + height:calc(~"28px/1.5"); + } + } } &.x-huge, .btn-group.x-huge > & { :not(svg).icon { + @media + only screen and (-webkit-min-device-pixel-ratio: 1.5), + only screen and (min-resolution: 1.5dppx), + only screen and (min-resolution: 144dpi) { + background-image: ~"url('@{common-image-const-path}/controls/toolbarbig@1.5x.png')"; + background-size: 78px auto; + } + .background-ximage('@{common-image-path}/controls/toolbarbig.png', '@{common-image-path}/controls/toolbarbig@2x.png', 78px); } } @@ -333,6 +372,7 @@ > .dropdown-toggle:first-child { .inner-box-caret { padding: 0 2px; + float: right; } } diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 6e082188d..d81d23c55 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -291,6 +291,14 @@ svg.icon { display: inline-block; vertical-align: middle; + + @media + only screen and (-webkit-min-device-pixel-ratio: 1.5), + only screen and (min-resolution: 1.5dppx), + only screen and (min-resolution: 144dpi) { + width:calc(~"28px/1.5"); + height:calc(~"28px/1.5"); + } } .btn&[disabled], diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index acdb1b86a..d5d1c65f6 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -292,7 +292,8 @@ define([ this.btnAlignLeft = new Common.UI.Button({ id: 'id-toolbar-btn-align-left', cls: 'btn-toolbar', - iconCls: 'btn-align-left', + // iconCls: 'btn-align-left', + iconCls: 'svgicon svg-btn-align-left', enableToggle: true, allowDepress: false, toggleGroup: 'alignGroup' @@ -302,7 +303,8 @@ define([ this.btnAlignCenter = new Common.UI.Button({ id: 'id-toolbar-btn-align-center', cls: 'btn-toolbar', - iconCls: 'btn-align-center', + // iconCls: 'btn-align-center', + iconCls: 'svgicon svg-btn-align-center', enableToggle: true, allowDepress: false, toggleGroup: 'alignGroup' @@ -312,7 +314,8 @@ define([ this.btnAlignRight = new Common.UI.Button({ id: 'id-toolbar-btn-align-right', cls: 'btn-toolbar', - iconCls: 'btn-align-right', + // iconCls: 'btn-align-right', + iconCls: 'svgicon svg-btn-align-right', enableToggle: true, allowDepress: false, toggleGroup: 'alignGroup' @@ -322,7 +325,8 @@ define([ this.btnAlignJust = new Common.UI.Button({ id: 'id-toolbar-btn-align-just', cls: 'btn-toolbar', - iconCls: 'btn-align-just', + // iconCls: 'btn-align-just', + iconCls: 'svgicon svg-btn-align-just', enableToggle: true, allowDepress: false, toggleGroup: 'alignGroup' @@ -378,21 +382,24 @@ define([ this.btnDecLeftOffset = new Common.UI.Button({ id: 'id-toolbar-btn-decoffset', cls: 'btn-toolbar', - iconCls: 'btn-decoffset' + // iconCls: 'btn-decoffset' + iconCls: 'svgicon svg-btn-decoffset' }); this.paragraphControls.push(this.btnDecLeftOffset); this.btnIncLeftOffset = new Common.UI.Button({ id: 'id-toolbar-btn-incoffset', cls: 'btn-toolbar', - iconCls: 'btn-incoffset' + // iconCls: 'btn-incoffset' + iconCls: 'svgicon svg-btn-incoffset' }); this.paragraphControls.push(this.btnIncLeftOffset); this.btnLineSpace = new Common.UI.Button({ id: 'id-toolbar-btn-linespace', cls: 'btn-toolbar', - iconCls: 'btn-linespace', + // iconCls: 'btn-linespace', + iconCls: 'svgicon svg-btn-linespace', menu: new Common.UI.Menu({ style: 'min-width: 60px;', items: [ @@ -410,7 +417,8 @@ define([ this.btnShowHidenChars = new Common.UI.Button({ id: 'id-toolbar-btn-hidenchars', cls: 'btn-toolbar', - iconCls: 'btn-hidenchars', + // iconCls: 'btn-hidenchars', + iconCls: 'svgicon svg-btn-hidenchars', enableToggle: true, split: true, menu: new Common.UI.Menu({ @@ -426,7 +434,8 @@ define([ this.btnMarkers = new Common.UI.Button({ id: 'id-toolbar-btn-markers', cls: 'btn-toolbar', - iconCls: 'btn-setmarkers', + // iconCls: 'btn-setmarkers', + iconCls: 'svgicon svg-btn-setmarkers', enableToggle: true, toggleGroup: 'markersGroup', split: true, @@ -438,7 +447,8 @@ define([ this.btnNumbers = new Common.UI.Button({ id: 'id-toolbar-btn-numbering', cls: 'btn-toolbar', - iconCls: 'btn-numbering', + // iconCls: 'btn-numbering', + iconCls: 'svgicon svg-btn-numbering', enableToggle: true, toggleGroup: 'markersGroup', split: true, @@ -450,7 +460,8 @@ define([ this.btnMultilevels = new Common.UI.Button({ id: 'id-toolbar-btn-multilevels', cls: 'btn-toolbar', - iconCls: 'btn-multilevels', + // iconCls: 'btn-multilevels', + iconCls: 'svgicon svg-btn-multilevels', menu: true }); this.paragraphControls.push(this.btnMultilevels); @@ -475,7 +486,8 @@ define([ this.btnInsertTable = new Common.UI.Button({ id: 'tlbtn-inserttable', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-inserttable', + // iconCls: 'btn-inserttable', + iconCls: 'svgicon svg-btn-inserttable', caption: me.capBtnInsTable, menu: new Common.UI.Menu({ items: [ @@ -489,7 +501,8 @@ define([ this.btnInsertImage = new Common.UI.Button({ id: 'tlbtn-insertimage', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-insertimage', + // iconCls: 'btn-insertimage', + iconCls: 'svgicon svg-btn-insertimage', caption: me.capBtnInsImage, menu: new Common.UI.Menu({ items: [ @@ -505,7 +518,8 @@ define([ id: 'tlbtn-insertchart', cls: 'btn-toolbar x-huge icon-top', caption: me.capBtnInsChart, - iconCls: 'btn-insertchart', + // iconCls: 'btn-insertchart', + iconCls: 'svgicon svg-btn-insertchart', menu: true }); this.paragraphControls.push(this.btnInsertChart); @@ -535,7 +549,8 @@ define([ this.btnEditHeader = new Common.UI.Button({ id: 'id-toolbar-btn-editheader', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-editheader', + // iconCls: 'btn-editheader', + iconCls: 'svgicon svg-btn-editheader', caption: me.capBtnInsHeader, menu: true }); @@ -566,7 +581,8 @@ define([ this.btnInsertShape = new Common.UI.Button({ id: 'tlbtn-insertshape', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'btn-insertshape', + // iconCls: 'btn-insertshape', + iconCls: 'svgicon svg-btn-insertshape', caption: me.capBtnInsShape, enableToggle: true, menu: new Common.UI.Menu({cls: 'menu-shapes'}) @@ -1326,7 +1342,7 @@ define([ _injectComponent('#slot-img-wrapping', this.btnImgWrapping); _injectComponent('#slot-btn-watermark', this.btnWatermark); - this.btnsPageBreak = Common.Utils.injectButtons($host.find('.btn-slot.btn-pagebreak'), '', 'btn-pagebreak', this.capBtnInsPagebreak, undefined, true, true); + this.btnsPageBreak = Common.Utils.injectButtons($host.find('.btn-slot.btn-pagebreak'), '', /*'btn-pagebreak'*/'svgicon svg-btn-pagebreak', this.capBtnInsPagebreak, undefined, true, true); Array.prototype.push.apply(this.paragraphControls, this.btnsPageBreak); return $host; diff --git a/apps/documenteditor/main/resources/img/toolbar-menu@1.5x.png b/apps/documenteditor/main/resources/img/toolbar-menu@1.5x.png new file mode 100644 index 0000000000000000000000000000000000000000..55fbb602d16c46194942b99bd20eecc1c26f1f04 GIT binary patch literal 11602 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 V>>oHn4gdUs7a*l5SuJiH{9nC}O0@t0 literal 0 HcmV?d00001