From 326e5bfa985fc16f4da9b6096123210cd2931702 Mon Sep 17 00:00:00 2001
From: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com>
Date: Tue, 24 Apr 2018 20:07:04 +0300
Subject: [PATCH] [All] correction z-order for synchronize tooltip

---
 apps/common/main/lib/component/SynchronizeTip.js         | 2 +-
 apps/common/main/resources/less/synchronize-tip.less     | 4 ++++
 apps/documenteditor/main/app/view/Toolbar.js             | 1 +
 apps/presentationeditor/main/app/view/Toolbar.js         | 1 +
 apps/presentationeditor/main/resources/less/toolbar.less | 4 ++--
 apps/spreadsheeteditor/main/app/view/Toolbar.js          | 1 +
 apps/spreadsheeteditor/main/resources/less/toolbar.less  | 4 ++--
 7 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/common/main/lib/component/SynchronizeTip.js b/apps/common/main/lib/component/SynchronizeTip.js
index c6a62df899..d3cce7eaf4 100644
--- a/apps/common/main/lib/component/SynchronizeTip.js
+++ b/apps/common/main/lib/component/SynchronizeTip.js
@@ -48,7 +48,7 @@ define([
             },
 
             template: _.template([
-                '<div class="synch-tip-root <%= scope.placement %>">',
+                '<div class="synch-tip-root <% if (!!scope.options.extCls) {print(scope.options.extCls + \" \");} %><%= scope.placement %>">',
                     '<div class="asc-synchronizetip">',
                         '<div class="tip-arrow <%= scope.placement %>"></div>',
                         '<div>',
diff --git a/apps/common/main/resources/less/synchronize-tip.less b/apps/common/main/resources/less/synchronize-tip.less
index bc0abfbb66..3853c21aad 100644
--- a/apps/common/main/resources/less/synchronize-tip.less
+++ b/apps/common/main/resources/less/synchronize-tip.less
@@ -3,6 +3,10 @@
     z-index: @zindex-navbar + 2;
     width: 300px;
 
+    &.inc-index {
+        z-index: @zindex-navbar + 4;
+    }
+
     .tip-arrow {
         position: absolute;
         overflow: hidden;
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index fc879aaf59..cc81c48d97 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -2052,6 +2052,7 @@ define([
 
             createSynchTip: function () {
                 this.synchTooltip = new Common.UI.SynchronizeTip({
+                    extCls: this.mode.isDesktopApp ? 'inc-index' : undefined,
                     target: this.btnCollabChanges.$el
                 });
                 this.synchTooltip.on('dontshowclick', function () {
diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js
index 0faefcde32..008bf3ee23 100644
--- a/apps/presentationeditor/main/app/view/Toolbar.js
+++ b/apps/presentationeditor/main/app/view/Toolbar.js
@@ -1404,6 +1404,7 @@ define([
 
             createSynchTip: function () {
                 this.synchTooltip = new Common.UI.SynchronizeTip({
+                    extCls: this.mode.isDesktopApp ? 'inc-index' : undefined,
                     target: this.btnCollabChanges.$el
                 });
                 this.synchTooltip.on('dontshowclick', function () {
diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less
index 95fcab43de..081a2a5f79 100644
--- a/apps/presentationeditor/main/resources/less/toolbar.less
+++ b/apps/presentationeditor/main/resources/less/toolbar.less
@@ -25,11 +25,11 @@
     position: absolute;
     top: 32px;
     left: 48px;
-    right: 45px;
+    right: 0;
     bottom: 0;
     opacity: 0;
     background-color: @gray-light;
-    z-index: @zindex-tooltip + 1;
+    /*z-index: @zindex-tooltip + 1;*/
 }
 
 .menu-layouts {
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index c6373a31ee..0721cd4d53 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -1756,6 +1756,7 @@ define([
 
         createSynchTip: function () {
             this.synchTooltip = new Common.UI.SynchronizeTip({
+                extCls: this.mode.isDesktopApp ? 'inc-index' : undefined,
                 target: this.btnCollabChanges.$el
             });
             this.synchTooltip.on('dontshowclick', function() {
diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less
index ebacaa1d53..b737be58a7 100644
--- a/apps/spreadsheeteditor/main/resources/less/toolbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less
@@ -47,11 +47,11 @@
     position: absolute;
     top: 32px;
     left: 48px;
-    right: 45px;
+    right: 0;
     bottom: 0;
     opacity: 0;
     background-color: @gray-light;
-    z-index: @zindex-tooltip + 1;
+    /*z-index: @zindex-tooltip + 1;*/
 }
 
 .color-schemas-menu {