From c1af5347833d9b7dee1688712788795071e386c8 Mon Sep 17 00:00:00 2001
From: OVSharova <olga.sharova@onlyoffice.com>
Date: Thu, 29 Jul 2021 04:25:33 +0300
Subject: [PATCH] First change

---
 apps/common/main/lib/component/Window.js      |  2 +-
 apps/common/main/lib/view/OpenDialog.js       |  2 +-
 .../main/resources/img/controls/attention.svg |  4 ++++
 .../main/resources/img/controls/done.svg      |  4 ++++
 .../main/resources/img/controls/info.svg      |  4 ++++
 .../main/resources/img/controls/warning.svg   |  4 ++++
 .../main/resources/less/opendialog.less       |  6 +++---
 apps/common/main/resources/less/window.less   | 19 ++++++++++++-------
 .../template/DataValidationDialog.template    |  2 +-
 9 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 apps/common/main/resources/img/controls/attention.svg
 create mode 100644 apps/common/main/resources/img/controls/done.svg
 create mode 100644 apps/common/main/resources/img/controls/info.svg
 create mode 100644 apps/common/main/resources/img/controls/warning.svg

diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js
index cb6ac13b4..2a5d65545 100644
--- a/apps/common/main/lib/component/Window.js
+++ b/apps/common/main/lib/component/Window.js
@@ -455,7 +455,7 @@ define([
             if (!options.width) options.width = 'auto';
             
             var template =  '<div class="info-box">' +
-                                '<% if (typeof iconCls !== "undefined") { %><div class="icon img-commonctrl img-colored <%= iconCls %>"></div><% } %>' +
+                                '<% if (typeof iconCls !== "undefined") { %><div class="icon <%= iconCls %>"></div><% } %>' +
                                 '<div class="text" <% if (typeof iconCls == "undefined") { %> style="padding-left:10px;" <% } %>><span><%= msg %></span>' +
                                     '<% if (dontshow) { %><div class="dont-show-checkbox"></div><% } %>' +
                                 '</div>' +
diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js
index fce9a2ee1..0c9750364 100644
--- a/apps/common/main/lib/view/OpenDialog.js
+++ b/apps/common/main/lib/view/OpenDialog.js
@@ -97,7 +97,7 @@ define([
                     '<% if (type == Common.Utils.importTextType.DRM) { %>',
                         '<% if (warning) { %>',
                         '<div>',
-                            '<div class="icon img-commonctrl warn"></div>',
+                            '<div class="icon warn"></div>',
                             '<div style="padding-left: 50px;"><div style="font-size: 12px;">' + (typeof _options.warningMsg=='string' ? _options.warningMsg : t.txtProtected) + '</div>',
                                 '<label class="header" style="margin-top: 15px;">' + t.txtPassword + '</label>',
                                 '<div id="id-password-txt" style="width: 290px;"></div></div>',
diff --git a/apps/common/main/resources/img/controls/attention.svg b/apps/common/main/resources/img/controls/attention.svg
new file mode 100644
index 000000000..67e0988f5
--- /dev/null
+++ b/apps/common/main/resources/img/controls/attention.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.25245 31.1904L18.366 4.94276C19.0898 3.68575 20.9102 3.68575 21.634 4.94275L36.7475 31.1904C37.4678 32.4412 36.5612 34 35.1136 34H4.88642C3.43881 34 2.53225 32.4412 3.25245 31.1904Z" fill="#FFD112"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21 25H19L18 18V12H22V18L21 25ZM22 31H18V27H22V31Z" fill="white"/>
+</svg>
diff --git a/apps/common/main/resources/img/controls/done.svg b/apps/common/main/resources/img/controls/done.svg
new file mode 100644
index 000000000..1957986fb
--- /dev/null
+++ b/apps/common/main/resources/img/controls/done.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="20" cy="20" r="16" fill="#009900"/>
+<path d="M12 20L18 26L29 15" stroke="white" stroke-width="4"/>
+</svg>
diff --git a/apps/common/main/resources/img/controls/info.svg b/apps/common/main/resources/img/controls/info.svg
new file mode 100644
index 000000000..91b23c137
--- /dev/null
+++ b/apps/common/main/resources/img/controls/info.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="20" cy="20" r="16" fill="#007DF1"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22 10H18V14H22V10ZM22 17H18V30H22V17Z" fill="white"/>
+</svg>
diff --git a/apps/common/main/resources/img/controls/warning.svg b/apps/common/main/resources/img/controls/warning.svg
new file mode 100644
index 000000000..87caf23a4
--- /dev/null
+++ b/apps/common/main/resources/img/controls/warning.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="20" cy="20" r="16" fill="#F62211"/>
+<rect x="10" y="17" width="20" height="6" fill="white"/>
+</svg>
diff --git a/apps/common/main/resources/less/opendialog.less b/apps/common/main/resources/less/opendialog.less
index a58a97b26..5abbc9ca9 100644
--- a/apps/common/main/resources/less/opendialog.less
+++ b/apps/common/main/resources/less/opendialog.less
@@ -77,14 +77,14 @@
         }
       }
 
-      .icon.img-commonctrl {
+      .icon {
         float: left;
         width: 35px;
         height: 35px;
 
         &.warn {
-          height: 32px;
-          background-position: @alerts-offset-x @alerts-offset-y - 105px;
+          background: url('../../../../common/main/resources/img/controls/attention.svg') no-repeat center;
+          //background-position: @alerts-offset-x @alerts-offset-y - 105px;
         }
       }
     }
diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less
index 65294ef4d..e32929347 100644
--- a/apps/common/main/resources/less/window.less
+++ b/apps/common/main/resources/less/window.less
@@ -172,26 +172,31 @@
 
     .icon {
         &.warn {
-            width: 35px;
-            height: 32px;
-            background-position: @alerts-offset-x @alerts-offset-y - 105px;
+
+            background: url('../../../../common/main/resources/img/controls/attention.svg') no-repeat center;
+
+            //background-position: @alerts-offset-x @alerts-offset-y - 105px;
         }
 
-        &.error, &.info, &.confirm {
+        &.error, &.info, &.confirm, &.warn {
             width: 35px;
             height: 35px;
         }
 
         &.error {
-            background-position: @alerts-offset-x @alerts-offset-y - 0;
+            background: url('../../../../common/main/resources/img/controls/warning.svg') no-repeat center;
+            //background-position: @alerts-offset-x @alerts-offset-y - 0;
         }
 
         &.info {
-            background-position: @alerts-offset-x @alerts-offset-y - 35px;
+            background: url('../../../../common/main/resources/img/controls/info.svg') no-repeat center;
+            //background-position: @alerts-offset-x @alerts-offset-y - 35px;
         }
 
         &.confirm {
-            background-position: @alerts-offset-x @alerts-offset-y - 70px;
+            background: url('../../../../common/main/resources/img/controls/done.svg') no-repeat center;
+
+            //background-position: @alerts-offset-x @alerts-offset-y - 70px;
         }
     }
 
diff --git a/apps/spreadsheeteditor/main/app/template/DataValidationDialog.template b/apps/spreadsheeteditor/main/app/template/DataValidationDialog.template
index ef85cbaf5..51c6e44eb 100644
--- a/apps/spreadsheeteditor/main/app/template/DataValidationDialog.template
+++ b/apps/spreadsheeteditor/main/app/template/DataValidationDialog.template
@@ -89,7 +89,7 @@
             <tr>
                 <td class="padding-small">
                     <div style="display: inline-block; margin-right: 5px;vertical-align: bottom;">
-                        <div id="data-validation-img-style" class="icon img-commonctrl error" style="margin-bottom: -1px;"></div>
+                        <div id="data-validation-img-style" class="icon  error" style="margin-bottom: -1px;"></div>
                     </div>
                     <div style="display: inline-block;">
                         <label class="input-label"><%= scope.textStyle %></label>