From b1009e895a10d76195bcf8ad811b85ddff070146 Mon Sep 17 00:00:00 2001
From: maxkadushkin <maxim.kadushkin@onlyoffice.com>
Date: Sun, 9 Apr 2023 23:35:25 +0300
Subject: [PATCH] [scaling] refactoring button's svg icon

---
 apps/common/main/lib/component/Button.js     |  7 +---
 apps/common/main/resources/less/buttons.less | 40 --------------------
 2 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js
index 053bfc2fe5..3dd2185510 100644
--- a/apps/common/main/lib/component/Button.js
+++ b/apps/common/main/lib/component/Button.js
@@ -186,8 +186,7 @@ define([
                 '<img src="<%= iconImg %>">' +
             '<% } else { %>' +
                 '<% if (/svgicon/.test(iconCls)) {' +
-                    'print(\'<svg class=\"icon uni-scale\"><use class=\"zoom-int\" xlink:href=\"#\' + /svgicon\\s(\\S+)/.exec(iconCls)[1] + \'\"></use>' +
-                                                    '<use class=\"zoom-grit\" xlink:href=\"#\' + /svgicon\\s(\\S+)/.exec(iconCls)[1] + \'-150\"></use></svg>\');' +
+                    'print(\'<svg class=\"icon uni-scale\"><use class=\"zoom-int\" xlink:href=\"#\' + /svgicon\\s(\\S+)/.exec(iconCls)[1] + \'\"></use></svg>\');' +
             '} else ' +
                     'print(\'<i class=\"icon \' + iconCls + \'\">&nbsp;</i>\'); %>' +
             '<% } %>';
@@ -285,8 +284,7 @@ define([
                 // '<% if (iconCls != "") { print(\'<i class=\"icon \' + iconCls + \'\">&nbsp;</i>\'); }} %>',
                 '<% if (iconCls != "") { ' +
                     ' if (/svgicon/.test(iconCls)) {' +
-                        'print(\'<svg class=\"icon uni-scale\"><use class=\"zoom-int\" xlink:href=\"#\' + /svgicon\\s(\\S+)/.exec(iconCls)[1] + \'\"></use>' +
-                            '<use class=\"zoom-grit\" xlink:href=\"#\' + /svgicon\\s(\\S+)/.exec(iconCls)[1] + \'-150\"></use></svg>\');' +
+                        'print(\'<svg class=\"icon uni-scale\"><use class=\"zoom-int\" xlink:href=\"#\' + /svgicon\\s(\\S+)/.exec(iconCls)[1] + \'\"></use></svg>\');' +
                     '} else ' +
                         'print(\'<i class=\"icon \' + iconCls + \'\">&nbsp;</i>\'); ' +
                 '}} %>',
@@ -749,7 +747,6 @@ define([
             if (/svgicon/.test(this.iconCls)) {
                 var icon = /svgicon\s(\S+)/.exec(this.iconCls);
                 btnIconEl.find('use.zoom-int').attr('xlink:href', icon && icon.length>1 ? '#' + icon[1]: '');
-                btnIconEl.find('use.zoom-grit').attr('xlink:href', icon && icon.length>1 ? '#' + icon[1] + '-150' : '');
             } else {
                 btnIconEl.removeClass(oldCls);
                 btnIconEl.addClass(cls || '');
diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index 8d8e029ea2..ad517adba1 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -1281,43 +1281,3 @@
         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