diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index e55b50942..57cfac85d 100644 --- a/apps/common/main/lib/component/Button.js +++ b/apps/common/main/lib/component/Button.js @@ -190,7 +190,8 @@ define([ // '<% if (iconCls != "") { print(\' \'); }} %>', '<% if (iconCls != "") { ' + ' if (/svgicon/.test(iconCls)) {' + - 'print(\'\');' + + 'print(\'' + + '\');' + '} else ' + 'print(\' \'); ' + '}} %>', diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 792c70ff7..0ce0f489e 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -83,7 +83,10 @@ define([ // '' + '' + '' + - '' + + '' + + '' + + '' + + '' + '+' + '' + '' + diff --git a/apps/common/main/resources/img/header/buttons150.svg b/apps/common/main/resources/img/header/buttons150.svg new file mode 100644 index 000000000..1534f858f --- /dev/null +++ b/apps/common/main/resources/img/header/buttons150.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 90545b262..661174506 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -674,3 +674,43 @@ min-width: 86px; } } + +@class100: zoom-int; +@class150: zoom-grit; +svg.icon { + .@{class150} { + display: none; + } + + @media + only screen and (-webkit-min-device-pixel-ratio: 1.5), + only screen and (-webkit-min-device-pixel-ratio: 2.5), + only screen and (min-resolution: 1.5dppx), + only screen and (min-resolution: 2.5dppx), + only screen and (min-resolution: 144dpi), + only screen and (min-resolution: 240dpi) { + .@{class100} { + display: none; + } + + .@{class150} { + display: block; + } + } + + @media + only screen and (-webkit-min-device-pixel-ratio: 2) and (-webkit-max-device-pixel-ratio: 2.4), + only screen and (-webkit-min-device-pixel-ratio: 4), + only screen and (min-resolution: 2dppx) and (max-resolution: 2.4dppx), + only screen and (min-resolution: 4dppx), + only screen and (min-resolution: 192dpi) and (max-resolution: 239dpi), + only screen and (min-resolution: 384dpi) { + .@{class100} { + display: block; + } + + .@{class150} { + display: none; + } + } +} \ No newline at end of file diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index bd847a88c..905d6a4fb 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -262,6 +262,7 @@ +