From dba13ffbdfcb82b02ec7795953836d061149bebf Mon Sep 17 00:00:00 2001
From: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com>
Date: Wed, 31 Mar 2021 19:52:05 +0300
Subject: [PATCH] [all] fixed logo on bundled app version

---
 .../resources/img/header/{dark-logo.svg => dark-logo_s.svg}    | 0
 .../img/header/{header-logo.svg => header-logo_s.svg}          | 0
 apps/common/main/resources/less/header.less                    | 2 +-
 apps/common/main/resources/less/toolbar.less                   | 2 +-
 apps/documenteditor/main/index.html                            | 2 +-
 apps/documenteditor/main/index.html.deploy                     | 2 +-
 apps/presentationeditor/main/index.html                        | 2 +-
 apps/presentationeditor/main/index.html.deploy                 | 2 +-
 apps/spreadsheeteditor/main/index.html                         | 2 +-
 apps/spreadsheeteditor/main/index.html.deploy                  | 2 +-
 build/documenteditor.json                                      | 3 ++-
 build/package.json                                             | 2 +-
 build/presentationeditor.json                                  | 3 ++-
 build/spreadsheeteditor.json                                   | 3 ++-
 14 files changed, 15 insertions(+), 12 deletions(-)
 rename apps/common/main/resources/img/header/{dark-logo.svg => dark-logo_s.svg} (100%)
 rename apps/common/main/resources/img/header/{header-logo.svg => header-logo_s.svg} (100%)

diff --git a/apps/common/main/resources/img/header/dark-logo.svg b/apps/common/main/resources/img/header/dark-logo_s.svg
similarity index 100%
rename from apps/common/main/resources/img/header/dark-logo.svg
rename to apps/common/main/resources/img/header/dark-logo_s.svg
diff --git a/apps/common/main/resources/img/header/header-logo.svg b/apps/common/main/resources/img/header/header-logo_s.svg
similarity index 100%
rename from apps/common/main/resources/img/header/header-logo.svg
rename to apps/common/main/resources/img/header/header-logo_s.svg
diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less
index 2a123766f..82a03b18e 100644
--- a/apps/common/main/resources/less/header.less
+++ b/apps/common/main/resources/less/header.less
@@ -141,7 +141,7 @@
             display: inline-block;
             vertical-align: middle;
 
-            background-image: ~"url('@{common-image-const-path}/header/header-logo.svg')";
+            background-image: ~"url('@{common-image-const-path}/header/header-logo_s.svg')";
             background-repeat: no-repeat;
         }
 
diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index 97b444bc8..d0d3137e8 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -381,7 +381,7 @@
         .extra {
             #header-logo {
                 i {
-                    background-image: ~"url('@{common-image-const-path}/header/dark-logo.svg')";
+                    background-image: ~"url('@{common-image-const-path}/header/dark-logo_s.svg')";
                     background-repeat: no-repeat;
                 }
             }
diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html
index 089163c3b..25689a90d 100644
--- a/apps/documenteditor/main/index.html
+++ b/apps/documenteditor/main/index.html
@@ -237,7 +237,7 @@
     <script src="../../common/main/lib/util/htmlutils.js"></script>
     <div id="loading-mask" class="loadmask">
         <div class="brendpanel" style="display: none;">
-            <div><div class="loading-logo"><img src="../../common/main/resources/img/header/header-logo.svg"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span></div></div>
+            <div><div class="loading-logo"><img src="../../common/main/resources/img/header/header-logo_s.svg"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span></div></div>
         <div class="sktoolbar" style="display: none;">
             <ul><li></li><li class="space"></li><li style="width: 209px;"></li><li class="space"></li><li style="width: 187px;"></li><li class="space"></li><li style="width: 60px;"></li><li class="fat"></li></ul>
             <ul><li></li><li class="space"></li><li style="width: 209px;"></li><li class="space"></li><li style="width: 187px;"></li><li class="space"></li><li style="width: 60px;"></li></ul>
diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy
index 278570e82..c69e97577 100644
--- a/apps/documenteditor/main/index.html.deploy
+++ b/apps/documenteditor/main/index.html.deploy
@@ -224,7 +224,7 @@
 <body>
     <script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>
 
-    <div id="loading-mask" class="loadmask"><div class="brendpanel" style="display: none;"><div><div class="loading-logo"><img src="../../../apps/documenteditor/main/resources/img/header/header-logo.svg"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span></div></div><div class="sktoolbar" style="display: none;"><ul><li></li><li class="space"></li><li style="width: 209px;"></li><li class="space"></li><li style="width: 187px;"></li><li class="space"></li><li style="width: 60px;"></li><li class="fat"></li></ul><ul><li></li><li class="space"></li><li style="width: 209px;"></li><li class="space"></li><li style="width: 187px;"></li><li class="space"></li><li style="width: 60px;"></li></ul></div><div class="placeholder" style="display: none;"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>
+    <div id="loading-mask" class="loadmask"><div class="brendpanel" style="display: none;"><div><div class="loading-logo"><img src="../../../apps/documenteditor/main/resources/img/header/header-logo_s.svg"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span></div></div><div class="sktoolbar" style="display: none;"><ul><li></li><li class="space"></li><li style="width: 209px;"></li><li class="space"></li><li style="width: 187px;"></li><li class="space"></li><li style="width: 60px;"></li><li class="fat"></li></ul><ul><li></li><li class="space"></li><li style="width: 209px;"></li><li class="space"></li><li style="width: 187px;"></li><li class="space"></li><li style="width: 60px;"></li></ul></div><div class="placeholder" style="display: none;"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>
     <div id="viewport"></div>
 
     <script>
diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html
index d1e6c4d73..9847f2341 100644
--- a/apps/presentationeditor/main/index.html
+++ b/apps/presentationeditor/main/index.html
@@ -274,7 +274,7 @@
     <script src="../../common/main/lib/util/htmlutils.js"></script>
     <div id="loading-mask" class="loadmask">
         <div class="brendpanel" style="display: none;">
-            <div><div class="loading-logo"><img src="../../common/main/resources/img/header/header-logo.svg"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div></div>
+            <div><div class="loading-logo"><img src="../../common/main/resources/img/header/header-logo_s.svg"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div></div>
         </div>
         <div class="sktoolbar" style="display: none;">
             <ul><li/><li class="space" style="width: 76px;"/><li class="split" /><li class="space"/><li style="width: 176px;"/><li class="space"/><li style="width: 115px;"/><li class="space" style="width: 183px;"/><li style="width: 95px;"/><li class="fat"/></ul>
diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy
index 7b02f5a4f..b4e367fa3 100644
--- a/apps/presentationeditor/main/index.html.deploy
+++ b/apps/presentationeditor/main/index.html.deploy
@@ -273,7 +273,7 @@
     <script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>
     <div id="loading-mask" class="loadmask">
         <div class="brendpanel" style="display: none;">
-            <div><div class="loading-logo"><img src="../../../apps/presentationeditor/main/resources/img/header/header-logo.svg"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div></div>
+            <div><div class="loading-logo"><img src="../../../apps/presentationeditor/main/resources/img/header/header-logo_s.svg"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div></div>
         </div>
         <div class="sktoolbar" style="display: none;">
             <ul><li/><li class="space" style="width: 76px;"/><li class="split" /><li class="space"/><li style="width: 176px;"/><li class="space"/><li style="width: 115px;"/><li class="space" style="width: 183px;"/><li style="width: 95px;"/><li class="fat"/></ul>
diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html
index 91737a037..b1f98863c 100644
--- a/apps/spreadsheeteditor/main/index.html
+++ b/apps/spreadsheeteditor/main/index.html
@@ -270,7 +270,7 @@
     <script src="../../common/main/lib/util/htmlutils.js"></script>
     <div id="loading-mask" class="loadmask">
         <div class="brendpanel" style="display: none;"><div>
-            <div class="loading-logo"><img src="../../common/main/resources/img/header/header-logo.svg"></div>
+            <div class="loading-logo"><img src="../../common/main/resources/img/header/header-logo_s.svg"></div>
             <div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div></div>
         </div>
         <div class="sktoolbar" style="display: none;">
diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy
index 6708b29e9..c0b600f56 100644
--- a/apps/spreadsheeteditor/main/index.html.deploy
+++ b/apps/spreadsheeteditor/main/index.html.deploy
@@ -268,7 +268,7 @@
     <script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>
     <div id="loading-mask" class="loadmask">
         <div class="brendpanel" style="display: none;"><div>
-            <div class="loading-logo"><img src="../../../apps/spreadsheeteditor/main/resources/img/header/header-logo.svg"></div>
+            <div class="loading-logo"><img src="../../../apps/spreadsheeteditor/main/resources/img/header/header-logo_s.svg"></div>
             <div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div></div>
         </div>
         <div class="sktoolbar" style="display: none;">
diff --git a/build/documenteditor.json b/build/documenteditor.json
index afba6cb9a..14aa4b7f2 100644
--- a/build/documenteditor.json
+++ b/build/documenteditor.json
@@ -200,7 +200,8 @@
                 }
             ],
             "clean": [
-                "../deploy/web-apps/apps/documenteditor/main/resources/img/**/*.svg"
+                "../deploy/web-apps/apps/documenteditor/main/resources/img/**/*.svg",
+                "!../deploy/web-apps/apps/documenteditor/main/resources/img/**/*_s.svg"
             ]
         }
     },
diff --git a/build/package.json b/build/package.json
index cf45091c1..0b1044c41 100644
--- a/build/package.json
+++ b/build/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "dependencies": {
     "grunt": "^1.0.0",
-    "grunt-contrib-clean": "^1.0.0",
+    "grunt-contrib-clean": "^2.0.0",
     "grunt-contrib-concat": "^0.5.1",
     "grunt-contrib-copy": "^0.8.0",
     "grunt-contrib-cssmin": "^3.0.0",
diff --git a/build/presentationeditor.json b/build/presentationeditor.json
index 965e811f4..0e32e998e 100644
--- a/build/presentationeditor.json
+++ b/build/presentationeditor.json
@@ -195,7 +195,8 @@
                 }
             ],
             "clean": [
-                "../deploy/web-apps/apps/presentationeditor/main/resources/img/**/*.svg"
+                "../deploy/web-apps/apps/presentationeditor/main/resources/img/**/*.svg",
+                "!../deploy/web-apps/apps/presentationeditor/main/resources/img/**/*_s.svg"
             ]
         },
         "reporter": {
diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json
index f76aacaa2..f9b453427 100644
--- a/build/spreadsheeteditor.json
+++ b/build/spreadsheeteditor.json
@@ -208,7 +208,8 @@
                 }
             ],
             "clean": [
-                "../deploy/web-apps/apps/spreadsheeteditor/main/resources/img/**/*.svg"
+                "../deploy/web-apps/apps/spreadsheeteditor/main/resources/img/**/*.svg",
+                "!../deploy/web-apps/apps/spreadsheeteditor/main/resources/img/**/*_s.svg"
             ]
         }
     },